From d6eb1c19fd819b220f6e7876e2516ebface5ee7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 12 Dec 2025 20:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=AD=8C=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/SingerSong.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index ec65d01d..cc9f53bb 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -281,7 +281,7 @@ class SingerSong extends Model
 
         $count = db::name('vs_song_log')->where($where)->count();
         if($type == 1){
-            $res1 = db::name('vs_song_log')->where(['status' => 1,'room_id' => $room_id])->order('id desc')->select();
+            $res1 = db::name('vs_song_log')->where(['status' => 1,'room_id' => $room_id])->select();
             $res2 = db::name('vs_song_log')->where(['status' => 0,'room_id' => $room_id])->order('sort desc')->page($page,$page_limit-1)->select();
             //把$res2 添加到$res1的 最后
             $res = array_merge($res1,$res2);