Merge remote-tracking branch 'origin/master'

puzhibing

2023-04-07 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5

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

@@ -26,7 +26,6 @@
                                    <option value="">状态</option>
                                    <option value="1">正常</option>
                                    <option value="2">冻结</option>
                                    <option value="3">已删除</option>
                                </select>
                            </div>
                            <div class="col-sm-2">
@@ -34,13 +33,15 @@
                                <#button name="重置" icon="fa-trash" clickFun="TAppUser.resetSearch()" space="true"/>
                            </div>
                            <div class="col-sm-3">
                                <button type="button" class="btn btn-primary " onclick="TAppUser.export()" id="export">
                                    <i class="fa "></i>&nbsp;导出
                                </button>
                                @if(shiro.hasPermission("/tAppUser/export-userInfo")){
                                <#button name="导出" icon="" clickFun="TAppUser.export()"/>
                                @}
                                @if(shiro.hasPermission("/tAppUser/add")){
                                <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
                                <button type="button" class="btn btn-primary " onclick="TAppUser.searchCoupon()" id="">
                                    <i class="fa "></i>&nbsp;赠送优惠劵
                                </button>
                                @}
                                @if(shiro.hasPermission("/tAppUser/sendCoupon")){
                                <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
                                @}
                            </div>
                        </div>
                        <!--<div class="hidden-xs" id="TAppUserTableToolbar" role="group">