Merge branch '0529-v3.3.0' of https://gitee.com/zwyjjc/tl_estate into 0529-v3.3.0

application/api_broker/controller/User.php

@@ -735,7 +735,7 @@ class User extends Basic
 
         if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){
             // $result = $this->OfficeUserLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
-            return $this->response("200", "success！", null);
+            return $this->response("200", "请求数据为空");
         }else{
             $result = $this->userLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
         }

application/index/controller/UserLog.php

@@ -119,7 +119,7 @@ class UserLog extends Basic{
 
 
         if($params['entrust_type'] == 1){
-            return $this->response("200", "success！", '');
+            return $this->response("101", "请求数据为空");
         }else{
             $result = $this->service_->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
         }