Merge remote-tracking branch 'origin/master'

puzhibing

2023-04-07 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.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">
@@ -40,7 +39,7 @@
                                </button>
                            </div>
                        </div>
                        <div class="hidden-xs" id="TAppUserTableToolbar" role="group">
                        <!--<div class="hidden-xs" id="TAppUserTableToolbar" role="group">
                            @if(shiro.hasPermission("/tAppUser/add")){
                                <#button name="添加" icon="fa-plus" clickFun="TAppUser.openAddTAppUser()"/>
                            @}
@@ -50,7 +49,7 @@
                            @if(shiro.hasPermission("/tAppUser/delete")){
                                <#button name="删除" icon="fa-remove" clickFun="TAppUser.delete()" space="true"/>
                            @}
                        </div>
                        </div>-->
                        <#table id="TAppUserExceptionTable"/>
                    </div>
                </div>