合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !257

@@ -248,7 +248,7 @@ class HouseAdmin extends Api
         $where = ['hb.house_id'=>$house_id];
         $where = ['hb.house_id'=>$house_id];
         $total_num = HouseBoard::where($where)
         $total_num = HouseBoard::where($where)
             ->alias('hb')
             ->alias('hb')
-            ->join('house_admin ha','ha.id = hb.admin_user_id')
+            ->join('house_admin ha','ha.user_id = hb.admin_user_id')
             ->count();
             ->count();
         $list = $this->getBoardList($where,$page,$pageNum);
         $list = $this->getBoardList($where,$page,$pageNum);
         $this->success('success',compact('total_num','list'));
         $this->success('success',compact('total_num','list'));