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

2025-10-29 09:27:35 +08:00
parent d09bb36ad7 6c87a8540a
commit b0e53b14ee
4 changed files with 81 additions and 24 deletions
--- a/application/adminapi/controller/Room.php
+++ b/application/adminapi/controller/Room.php
@@ -876,6 +876,12 @@ class Room extends adminApi
                }
            }
        }
+
+        //排序
+        $sort = input('sort', '');//排序 越大越靠前
+        if($sort !== ""){
+            $data['sort'] = $sort;
+        }
        $res = db::name('vs_room')->where('id',$room_id)->update($data);
        if($res){
            return V(1,"成功");