From fe056cd50bb323f6434f8b472a8f7cc0d79f0ded Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期五, 28 六月 2024 17:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 WebRoot/general/CustomControl/editLayout.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WebRoot/general/CustomControl/editLayout.html b/WebRoot/general/CustomControl/editLayout.html
index 4d83cc9..43f7b1f 100644
--- a/WebRoot/general/CustomControl/editLayout.html
+++ b/WebRoot/general/CustomControl/editLayout.html
@@ -57,7 +57,7 @@
                 <div class="layui-tab-item layui-show">
                   <div class="flex flex-end">
                     <div>
-                      <button class="btn-group" id="resetCurrentGrid">鎭㈠鍒濆</button>
+                      <button class="btn-group" id="resetCurrentGrid">閲嶇疆</button>
                     </div>
                   </div>
                   <div class="vue-component-div absolute">

--
Gitblit v1.8.0