Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

application/api_broker/service/OrderLogService.php

@@ -303,7 +303,7 @@ class OrderLogService
 
         //成交报告
         $field_bargain = "a.id,a.house_number,a.is_open,a.report_id,a.order_id,a.trade_type,a.submit_agent_id,a.industry_type,
-        a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone";
+        a.estimated_receipt_date,a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone";
         $bargainData   = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
         if (count($bargainData) > 0) {
             foreach ($bargainData as $k => $v) {
@@ -866,7 +866,7 @@ class OrderLogService
 
         $bargainModel       = new OBargainModel();
         $bargain_info_filed = "a.id,a.house_number,a.account_time,a.account_statement,a.father_id,a.is_open,a.trade_type,
-        a.price,a.industry_type,a.commission,c.id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name";
+        a.price,a.industry_type,a.estimated_receipt_date,a.commission,c.id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name";
 
         $result      = [];
         $bargainInfo = $bargainModel->selectBargainDetail($bargain_info_filed, $params);