Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

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

@@ -19,7 +19,7 @@
                                <#NameCon id="logName" name="用户名称" />
                            </div>
                            <div class="col-sm-2">
                                <#button name="搜索" icon="fa-search" clickFun="OptLog.search()"/>
                                <#button name="查询" icon="fa-search" clickFun="OptLog.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="OptLog.resetSearch()" space="true"/>
                            </div>
                        </div>