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

2025-11-08 11:11:42 +08:00
parent 57655e014d 20b4962e90
commit 3beb63f2a2
2 changed files with 6 additions and 2 deletions
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -191,6 +191,9 @@ class Room extends Model

        if(!empty($label_id) && $label_id > 0){
            $map['type_id'] = $label_id;
+            if($label_id == 1){
+                $map['label_id'] = 1;
+            }
        }
        if(!empty($label_id) && $label_id == -1){
            $map['is_hot'] = 2;