Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-26 b4f51073e4a5ac0fc14a2087af339cd39e267f0d

 cloud-server-management/src/main/webapp/WEB-INF/view/system/log/log.html

@@ -25,9 +25,7 @@
                        </div>
                        <div class="hidden-xs" id="OptLogTableToolbar" role="group">
                            <#button name="查看详情" icon="fa-plus" clickFun="OptLog.detail()"/>
                            @if(shiro.hasPermission("/log/delLog")){
                                <#button name="清空日志" icon="fa-plus" clickFun="OptLog.delLog()" space="true"/>
                            @}
                        </div>
                        <#table id="OptLogTable"/>
                    </div>