Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/index/service/UserLogService.php

@@ -402,7 +402,8 @@ class  UserLogService
     public function userDetailFull($user_id)
     {
         //查询客户详情
-        $field = 'id as user_id,agent_id,vip,create_time,first_login_time,referrer_source,referrer_id,registration_time,source_intro,referrer_source,source';
+        $field = 'id as user_id,agent_id,vip,create_time,first_login_time,referrer_source,referrer_id,registration_time,
+        source_intro,referrer_source,source,entrust_type,concrete_industry';
         $user_result = $this->userModel->getUserDetailStreamline($user_id,$field);
 
         if (count($user_result) <= 0) {