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_add.html |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
index 61caddc..15d42c1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -153,14 +153,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>

--
Gitblit v1.7.1