From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/meeting/rooms.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index b961a54..2dd7299 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -38,6 +38,7 @@
         <!-- <li><el-button @click="deleteByIdInBatch" v-permissions="['business:rooms:delete']">鍒犻櫎</el-button></li> -->
       </ul>
       <el-table
+          :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe
@@ -88,8 +89,8 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" label="鍒涘缓鏃堕棿"  align="center" min-width="140px"></el-table-column>
-        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
+        <el-table-column prop="createDate" label="鍒涘缓鏃堕棿"  align="center" min-width="160px"></el-table-column>
+        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="160px"></el-table-column>
         <!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
         <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
         <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>

--
Gitblit v1.9.3