From 6f56d57d870375d42bb13e94f3a0c4dcba9d4b53 Mon Sep 17 00:00:00 2001
From: 郭静帆 <gjfan@bronet.cn>
Date: Mon, 7 Jun 2021 13:43:06 +0800
Subject: [PATCH] 本月额外收入

---
 application/api/controller/User.php | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 1a5d106..c512b10 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -182,6 +182,7 @@ class User extends Api
             ->each(function($v){
                 // 格式化年月
                 $v->year_month = date('Y年m月',strtotime($v['year_month']));
+                $v->salary = $v['work_subsidy']+$v['recruit_subsidy'];
             });
         $this->success('成功', $data);
     }
--
libgit2 0.24.0