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/tBranchOffice/tBranchOffice.html |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
index 944fcb5..9d4f6ff 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
@@ -48,8 +48,12 @@
                                 @if(shiro.hasPermission("/tBranchOffice/update")){
                                 <#button name="编辑" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
                                 @}
+                                @if(shiro.hasPermission("/tBranchOffice/stop")){
                                 <#button name="冻结" icon="fa-edit" clickFun="TBranchOffice.stop()" space="true"/>
+                                @}
+                                @if(shiro.hasPermission("/tBranchOffice/start")){
                                 <#button name="启动" icon="fa-edit" clickFun="TBranchOffice.start()" space="true"/>
+                                @}
                             </div>
                         </div>
                         <!--<div class="hidden-xs" id="TBranchOfficeTableToolbar" role="group">

--
Gitblit v1.7.1