Merge branch 'test'

application/api_broker/service/OrderLogService.php

@@ -283,11 +283,10 @@ class OrderLogService
         }
 
         //收款
-        $field_pay_log = "id,order_no,father_id,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
+        $field_pay_log = "id,order_no,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
         remark,transfer_img,real_money,source,create_time";
         $payLogData    = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]);
         if (count($payLogData) > 0) {
-           // $sortPayLogData    = $this->arr2tree($payLogData);
             foreach ($payLogData as $k => $v) {
                 $v["step_name"]  = "pay_log";
                 $v["img_path"]   = CHAT_IMG_URL;