Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Party.php

@@ -398,6 +398,9 @@ class Party extends Common
                     throw new Exception($resultInfo['msg']);
                 }
             }
+            if (!isset($resultInfo['data'])) {
+                $resultInfo['data'] = [];
+            }
             $this->success("获取成功！",$resultInfo['data']);
         } catch (Exception $e) {;
             $this->error($e->getMessage());

application/common/service/RoomService.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace app\common\service;
+use think\Db;
 use think\Exception;
 use Redis;
 use app\common\service\TenimService;