Merge branch 'develop_test' into develop

This commit is contained in:
2026-01-05 15:44:58 +08:00
16 changed files with 2222 additions and 146 deletions

View File

@@ -92,6 +92,7 @@ class RoomAuction extends Model
$auction['relation_icon'] = db::name('vs_relation')->where('id',$auction['relation_id'])->value('icon');
$auction['base_image'] = db::name('vs_gift')->where('gid',$auction['gift_id'])->value('base_image');
$auction['gift_name'] = db::name('vs_gift')->where('gid',$auction['gift_id'])->value('gift_name');
$auction['gift_price'] = db::name('vs_gift')->where('gid',$auction['gift_id'])->value('gift_price');
$auction['time_day'] = $auction['time_day'] / 60 / 60;
}
// var_dump($auction);