Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/api/controller/Family.php

@@ -187,7 +187,7 @@ class Family extends Api
         }
 
         $data=FamilyModel::dataInfo(['id'=>$id]);
-        $data['family_name'] = AgentModel::dataValue(['family_id'=>$id,'status'=>1,'type'=>1]);
+        $data['shaikh_name'] = AgentModel::dataValue(['family_id'=>$id,'status'=>1,'type'=>1],"realname");
         $data['inheritor'] = AgentModel::dataList(['family_id'=>$id,'status'=>1,'type'=>2],"id,realname,level");
         
         if($data['village_id']){
@@ -363,6 +363,9 @@ class Family extends Api
             $info['is_show'] = true;
         }
 
+        $agent= AgentModel::dataInfo(['family_id'=>$family_id,'status'=>1,'type'=>1]);
+        $info['shaikh_name']=$agent?$agent['realname']:null;
+        $info['fastim_id']=$agent?\app\admin\model\fastim\User::where(['user_id'=>$agent['user_id']])->value("id"):'';
 
         $this->success("获取成功",['info' =>$info]);