From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html |   10 +---------
 1 files changed, 1 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..2dffc61 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}"
@@ -463,6 +454,7 @@
                     </div>
                 </div>
             </div>
+            </div>
 
             <div class="row btn-group-m-t">
                 <div class="col-sm-10 col-sm-offset-5">

--
Gitblit v1.7.1