Merge remote-tracking branch 'origin/master'

app/workerapi/lists/HistoryWorkLists.php

@@ -32,7 +32,7 @@ class HistoryWorkLists extends BaseWorkerDataLists
         //查询月数
         $create_month = !empty($this->params['create_month'])?$this->params['create_month']:date('Y-m');
         $list = ServiceWork::where($where)
-            ->field(['id', 'work_sn', 'address', 'title', 'work_status', 'service_status','work_pay_status','finished_time','base_service_fee','service_fee','work_total','create_time'])
+            ->field(['id', 'work_sn', 'address', 'title', 'work_status', 'service_status','work_pay_status','finished_time','base_service_fee','service_fee','work_total','create_time','work_amount'])
             ->append(['work_status_text','service_status_text'])
             ->whereMonth('create_time', $create_month)
             ->limit($this->limitOffset, $this->limitLength)

app/workerapi/lists/ServiceWorkLists.php

@@ -73,7 +73,7 @@ class ServiceWorkLists extends BaseWorkerDataLists
                 break;
         }
         $list = ServiceWork::where($where)
-            ->field(['id', 'work_sn', 'address', 'title', 'work_status', 'service_status', 'work_pay_status','appointment_time','receive_time','base_service_fee','service_fee'])
+            ->field(['id', 'work_sn', 'address', 'title', 'work_status', 'service_status', 'work_pay_status','appointment_time','receive_time','base_service_fee','service_fee','work_amount'])
             ->append(['work_status_text','service_status_text'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['appointment_time' => 'asc'])//上门时间排序