Merge remote-tracking branch 'origin/master'

puzhibing

2023-04-07 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5

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

@@ -41,9 +41,9 @@
                                <#button name="重置" icon="fa-trash" clickFun="TBill.resetSearch()" space="true"/>
                            </div>
                            <div class="col-sm-12">
                                <button type="button" class="btn btn-primary " onclick="TBill.export()" id="export">
                                    <i class="fa "></i>&nbsp;导出
                                </button>
                                @if(shiro.hasPermission("/tBill/export")){
                                <#button name="导出" icon="" clickFun="TBill.export()"/>
                                @}
                            </div>
                        </div>
                        <div class="hidden-xs" id="TBillTableToolbar" role="group">