Merge remote-tracking branch 'origin/master'

puzhibing

2023-04-07 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5

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

@@ -54,15 +54,15 @@
                            <#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/>
                        </div>
                        <div class="col-sm-12">
                            <button type="button" class="btn btn-primary " onclick="TOrder.cancelOrder()" id="cancelOrder">
                                <i class="fa "></i>&nbsp;取消订单
                            </button>
                            <button type="button" class="btn btn-primary " onclick="TOrder.tOrderException()" id="orderException">
                                <i class="fa "></i>&nbsp;异常
                            </button>
                            <button type="button" class="btn btn-primary " onclick="TOrder.export()" id="export">
                                <i class="fa "></i>&nbsp;导出
                            </button>
                            @if(shiro.hasPermission("/tOrder/cancelOrder")){
                            <#button name="取消订单" icon="" clickFun="TOrder.cancelOrder()"/>
                            @}
                            @if(shiro.hasPermission("/tOrder/tOrder-exception")){
                            <#button name="异常" icon="" clickFun="TOrder.tOrderException()"/>
                            @}
                            @if(shiro.hasPermission("/tOrder/export")){
                            <#button name="导出" icon="" clickFun="TOrder.export()"/>
                            @}
                        </div>
                        <div class="hidden-xs" id="TOrderTableToolbar" role="group">
                            @if(shiro.hasPermission("/tOrder/add")){