From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

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

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
index 10132af..21d040c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
@@ -63,6 +63,9 @@
                             @if(shiro.hasPermission("/tOrder/export")){
                             <#button name="导出" icon="" clickFun="TOrder.export()"/>
                             @}
+                            @if(shiro.hasPermission("/tOrder/cancelOrderUpdate")){
+                            <#button name="关闭订单" icon="" clickFun="TOrder.cancelOrderUpdate()"/>
+                            @}
                         </div>
                         <div class="hidden-xs" id="TOrderTableToolbar" role="group">
                             @if(shiro.hasPermission("/tOrder/add")){

--
Gitblit v1.7.1