From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

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

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
index e5fbcb1..f72a5c7 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -55,7 +55,7 @@
                                 </#SelectCon>
                             </div>
                             <div class="col-sm-3">
-                                <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+                                <#button name="查询" icon="fa-search" clickFun="TReassign.search()"/>
                                 <#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
                             </div>
                         </div>

--
Gitblit v1.7.1