合并分支 'akun' 到 'master'

Akun



查看合并请求 !3327

@@ -551,7 +551,7 @@ class InquiryForwardLogic extends BaseLogic
 
 
                 $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
                 $last_year_month = date('Y-m', strtotime($last_year_month . ' +1 month'));
             }
             }
-            $data_month['total'] = $data_month_total;
+            $data_month['合计'] = $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);
@@ -579,7 +579,7 @@ class InquiryForwardLogic extends BaseLogic
 
 
                 $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));
                 $last_week_day = date('Y-m-d', strtotime($last_week_day . ' +1 day'));
             }
             }
-            $data_week['total'] = $data_week_total;
+            $data_week['合计'] = $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);