From b5d4c83ebbe77a1331393bbd869b888a27b22d77 Mon Sep 17 00:00:00 2001
From: 郭静帆 <gjfan@bronet.cn>
Date: Tue, 1 Jun 2021 14:14:43 +0800
Subject: [PATCH] 本月额外收入
---
application/api/controller/User.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index ae9195c..1a5d106 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -129,7 +129,7 @@ class User extends Api
'work_salary_month' => $user['work_salary_month'],
'work_subsidy' => ($user['is_work'] == '1' && $user['factory']) ? $user['factory']['work_subsidy'] : 0,
'work_subsidy_month' => $user['work_subsidy_month'],
- 'lower_work_hours_month' => $lower_work_hours_month ? $lower_work_hours_month : 0.0,
+ 'lower_work_hours_month' => $lower_work_hours_month ? $lower_work_hours_month : '0.0',
'recruit_subsidy_month' => $user['recruit_subsidy_month'],
// 'salary' => $salary, //总工资
'salary' => $user['work_subsidy_month']+$user['recruit_subsidy_month'],
--
libgit2 0.24.0