合并分支 'heshupeng' 到 'master'

首页物业留言昵称



查看合并请求 !414

@@ -341,7 +341,7 @@ class HouseBoard extends Api
             ->join('user b','a.user_id = b.id')
             ->where('a.house_id',$house_id)
             // ->whereOr('a.id',$admin_user_id)
-            ->field('a.user_id,b.avatar,b.nickname')
+            ->field('a.user_id,a.nickname,b.avatar')
             ->order('a.is_direct')
             ->select();
         foreach ($data as &$v){