From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/system/dict.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/system/dict.vue b/admin/src/views/system/dict.vue
index 4e054ee..e87bf56 100644
--- a/admin/src/views/system/dict.vue
+++ b/admin/src/views/system/dict.vue
@@ -19,8 +19,7 @@
         <li><el-button type="primary" @click="$refs.operaDictWindow.open('鏂板缓瀛楀吀')" icon="el-icon-plus" v-permissions="['system:dict:create']">鏂板缓</el-button></li>
         <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:dict:delete']">鍒犻櫎</el-button></li>
       </ul>
-      <el-table
-          :height="tableHeightNew"
+      <el-table :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         :default-sort = "{prop: 'createTime', order: 'descending'}"

--
Gitblit v1.9.3