From f9fff682ff6b21344401bb86f85d25c97c37b073 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 17:01:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
index 4d5b517..454763e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -440,16 +440,7 @@
                                                         name="zc1" id="content6Num3" class="form-control newWidth"  readonly/>&nbsp;
                                     <br/>
                                     <br/>
-                                    有效期：
-                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    &nbsp;<input type="text"
 
-                                                 @if(isNotEmpty(item5Red)){
-                                                 value="${item5Red.effective}"
-                                                 @}else{
-                                                 value=""
-                                                 @}
-                                                 name="zc1" id="content6Num4" class="form-control newWidth" readonly/>&nbsp;天
                                     最高金额：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="text"
                                                                               @if(isNotEmpty(item5)){
                                                                               value="${item5.totalPrice}"

--
Gitblit v1.7.1