From 15df7700716d35e6b330e325fd10c971dbc4f3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 17 Nov 2025 14:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index f12693c..9878fad 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -837,7 +837,6 @@ class Room extends Model
             'is_pk' => $room['is_pk'],//1-默认接受PK，2不接受',
             'last_pk_room_id' => $last_pk_room_id,
             'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
-            'singer_innfo' => $singer_info,
         ];
 
         //房主信息
@@ -904,7 +903,8 @@ class Room extends Model
                 'song_pit_list' => $song_pit_list,
                 'friend_info' => $friend,
                 'gift_cycle' => $xlh_info,
-                'hour_ranking_open' => $hour_open
+                'hour_ranking_open' => $hour_open,
+                'singer_info' => $singer_info,
             ]
         ];
     }
@@ -2094,8 +2094,7 @@ class Room extends Model
             'head_line'=>$headline_data,
             'is_pk' => $room['is_pk'],//1-默认接受PK，2不接受',
             'last_pk_room_id' => $last_pk_room_id,
-            'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
-            'singer_innfo' => $singer_info,
+            'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count()
         ];
         //房主信息
         $room_owner = db::name('user')->where('id', $room['user_id'])->field('id as user_id,user_code,sex,nickname,avatar')->find();
@@ -2139,7 +2138,8 @@ class Room extends Model
                 'song_pit_list'=>$song_pit_list,
                 'friend_info' => $friend,
                 'gift_cycle' => $xlh_info,
-                'hour_ranking_open' => $hour_open
+                'hour_ranking_open' => $hour_open,
+                'singer_info' => $singer_info,
             ]
         ];
     }