Merge remote-tracking branch 'origin/develop' into develop

application/api/model/Room.php

@@ -1731,6 +1731,10 @@ class Room extends Model
             return ['code' => 0, 'msg' => '房间类型已存在', 'data' => null];
         }
 
+        if($roomInfo['type_id'] == 7 && ($roomInfo['step'] == 2 || $roomInfo['step'] == 3)){
+            return ['code' => 0, 'msg' => '请先结束交友后在修改房间类型', 'data' => null];
+        }
+
         //开启事务
         db::startTrans();
         $data = [];