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

application/api/model/Room.php

@@ -1761,6 +1761,13 @@ class Room extends Model
             return ['code' => 0, 'msg' => '请先结束交友后在修改房间类型', 'data' => null];
         }
 
+        if($roomInfo['type_id'] == 2){
+            $room_auction = db::name('vs_room_auction')->where(['room_id' => $room_id,'status' => 2])->select();
+            if($room_auction){
+                return ['code' => 0, 'msg' => '请先结束竞拍后在修改房间类型', 'data' => null];
+            }
+        }
+
         //开启事务
         db::startTrans();
         $data = [];