From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
index 358f2b4..dd87d07 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
@@ -13,7 +13,7 @@
                                 <#NameCon id="condition" name="名称" />
                             </div>
                             <div class="col-sm-3">
-                                <#button name="搜索" icon="fa-search" clickFun="TSystemConfig.search()"/>
+                                <#button name="查询" icon="fa-search" clickFun="TSystemConfig.search()"/>
                             </div>
                         </div>
                         <div class="hidden-xs" id="TSystemConfigTableToolbar" role="group">

--
Gitblit v1.7.1