合并分支 'akun' 到 'master'

update



查看合并请求 !3325

@@ -554,7 +554,7 @@ class InquiryForwardLogic extends BaseLogic
             $data_month['total'] = $data_month_total;
             $data_month['total'] = $data_month_total;
 
 
             foreach ($data_month as $km => $vm) {
             foreach ($data_month as $km => $vm) {
-                $data_month[$km]['合计'] = array_sum($vm);
+                $data_month[$km]['月/年合计'] = array_sum($vm);
             }
             }
 
 
             //周统计
             //周统计
@@ -582,7 +582,7 @@ class InquiryForwardLogic extends BaseLogic
             $data_week['total'] = $data_week_total;
             $data_week['total'] = $data_week_total;
 
 
             foreach ($data_week as $kw => $vw) {
             foreach ($data_week as $kw => $vw) {
-                $data_week[$kw]['合计'] = array_sum($vw);
+                $data_week[$kw]['日/周合计'] = array_sum($vw);
             }
             }
 
 
             $data = ['data_month' => $data_month, 'data_week' => $data_week];
             $data = ['data_month' => $data_month, 'data_week' => $data_week];