From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
index 54f5dfe..a1e6517 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
+++ b/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>

--
Gitblit v1.7.1