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

application/api/model/Room.php

@@ -4099,7 +4099,7 @@ class Room extends Model
         if($task_id == 33){
             //练歌：type= 1 label =2
             $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
-                ->where(['a.type_id' => 1,'a.label_id' => 2,'a.room_status' => 1,'b.user_id' => ['<>',0]])
+                ->where(['a.type_id' => 1,'a.label_id' => 2,'a.room_status' => 1,'b.user_id' => ['<>',0],'is_show_room'=>1])
                 ->column('a.id');
             if(!$room_ids){
                 return 0;