|
...
|
...
|
@@ -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' => $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'],
|
...
|
...
|
|
