Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

 management/guns-admin/src/main/webapp/WEB-INF/view/home.html

@@ -27,7 +27,7 @@
                  </div>
               </div>
               <div class="col-sm-2">
                  <#button name="搜索" icon="fa-search" clickFun="getData()"/>
                  <#button name="查询" icon="fa-search" clickFun="getData()"/>
               </div>
            </div>
            <div class="col-sm-3">
@@ -215,7 +215,7 @@
                  </div>
               </div>
               <div class="col-sm-2">
                  <#button name="搜索" icon="fa-search" clickFun="getData1()"/>
                  <#button name="查询" icon="fa-search" clickFun="getData1()"/>
               </div>
            </div>
            <div class="form-group">