From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 9d23bbf..4d5b517 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
@@ -272,14 +272,14 @@
<th style="width: 250px;">充值金额</th>
<th style="width: 250px;">有效天数</th>
<th style="width: 300px;">最高金额</th>
- <th style="width: 300px;">通用券金额</th>
- <th style="width: 300px;">通用券数量</th>
- <th style="width: 300px;">专车券金额</th>
- <th style="width: 300px;">专车券数量</th>
+ <th style="width: 300px;">通用优惠券金额</th>
+ <th style="width: 300px;">通用优惠卷数量</th>
+ <th style="width: 300px;">打车优惠券金额</th>
+ <th style="width: 300px;">打车优惠券数量</th>
<!--<th style="width: 400px;">出租车券金额</th>-->
<!--<th style="width: 400px;">出租车券数量</th>-->
- <!--<th style="width: 300px;">城际金额</th>-->
- <!--<th style="width: 300px;">城际券数量</th>-->
+ <th style="width: 300px;">包裹优惠卷金额</th>
+ <th style="width: 300px;">包裹优惠券数量</th>
<th style="width: 100px;">操作</th>
</tr>
</thead>
@@ -295,11 +295,11 @@
<td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
<td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
- <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
- <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+<!-- <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>-->
+<!-- <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>-->
- <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
- <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+ <td><input type="hidden" id="num9" name="num7" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+ <td><input type="hidden" id="num8" name="num6" value="${obj.intercityNum}">${obj.intercityNum}</td>
<td><button onclick="deleteSub(this)">移除</button></td>
</tr>
@}
--
Gitblit v1.7.1