解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 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;