From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突

---
 admin/src/views/roomStatus/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index df81122..88f0ef1 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/admin/src/views/roomStatus/index.vue
@@ -1246,7 +1246,7 @@
         .box_content {
             width: 100%;
             display: flex;
-            align-items: start;
+            align-items: flex-start;
             justify-content: space-between;
             .left {
                 width: 300px;

--
Gitblit v1.9.3