Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

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

@@ -21,40 +21,29 @@
                            <div class="col-sm-2">
                                <#NameCon id="phone" name="手机号" />
                            </div>
                            <div class="col-sm-1">
                                <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
                                    <option value="">状态</option>
                                    <option value="1">正常</option>
                                    <option value="2">冻结</option>
                                </select>
                            <div class="col-sm-2">
                                <#SelectCon id="status" name="状态" >
                                <option value="">状态</option>
                                <option value="1">正常</option>
                                <option value="2">冻结</option>
                            </#SelectCon>
                            </div>
                            <div class="col-sm-2">
                                <#button name="搜索" icon="fa-search" clickFun="TAppUser.search()"/>
                                <#button name="查询" icon="fa-search" clickFun="TAppUser.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TAppUser.resetSearch()" space="true"/>
                            </div>
                            <div class="col-sm-3">
                                @if(shiro.hasPermission("/tAppUser/export-userInfo")){
                                <#button name="导出" icon="" clickFun="TAppUser.export()"/>
                                @}
                                @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
                                <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
                                @}
                                @if(shiro.hasPermission("/tAppUser/sendCoupon")){
                                <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
                                @}
                            </div>
                        </div>
                        <!--<div class="hidden-xs" id="TAppUserTableToolbar" role="group">
                            @if(shiro.hasPermission("/tAppUser/add")){
                                <#button name="添加" icon="fa-plus" clickFun="TAppUser.openAddTAppUser()"/>
                        <div class="hidden-xs" id="TAppUserTableToolbar" role="group">
                            @if(shiro.hasPermission("/tAppUser/export-userInfo")){
                            <#button name="导出" icon="" clickFun="TAppUser.export()"/>
                            @}
                            @if(shiro.hasPermission("/tAppUser/update")){
                                <#button name="修改" icon="fa-edit" clickFun="TAppUser.openTAppUserDetail()" space="true"/>
                            @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
                            <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
                            @}
                            @if(shiro.hasPermission("/tAppUser/delete")){
                                <#button name="删除" icon="fa-remove" clickFun="TAppUser.delete()" space="true"/>
                            @if(shiro.hasPermission("/tAppUser/sendCoupon")){
                            <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
                            @}
                        </div>-->
                        </div>
                        <#table id="TAppUserTable"/>
                    </div>
                </div>