YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-12-07 12:22:35 +08:00
parent 5820fed771 f0d4efa6f2
commit e2e27e386d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/model/Room.php
View File

@@ -1141,7 +1141,7 @@ class Room extends Model
{ {
//房间正在拍的信息 //房间正在拍的信息
$auction = db::name('vs_room_auction')->alias('a')->join('user b', 'a.user_id = b.id', 'left') $auction = db::name('vs_room_auction')->alias('a')->join('user b', 'a.user_id = b.id', 'left')
->field('a.auction_id,a.user_id,b.nickname,b.avatar,b.sex,b.user_code,a.auction_type,a.relation_id,a.gift_id,a.gift_price,a.time_day,a.duration,') ->field('a.auction_id,a.user_id,b.nickname,b.avatar,b.sex,b.user_code,a.auction_type,a.relation_id,a.gift_id,a.gift_price,a.time_day,a.duration')
->where(['a.room_id' => $room_id,'a.status' => 2])->find(); ->where(['a.room_id' => $room_id,'a.status' => 2])->find();
// var_dump($auction);exit; // var_dump($auction);exit;
if($auction){ if($auction){