From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

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

diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
index 561e301..4d240d1 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -83,7 +83,7 @@
                                                                               @if(isNotEmpty(item1Coupon)){
                                                                               value="${item1Coupon.couponUseType==0?'通用券':
                                                                               item1Coupon.couponUseType==1?'专车券':
-                                                                              item1Coupon.couponUseType==2?'出租券':'直通车券'}"
+                                                                              item1Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                               @}else{
                                                                               value=""
                                                                               @}
@@ -184,7 +184,7 @@
                                                                               @if(isNotEmpty(item2Coupon)){
                                                                               value="${item2Coupon.couponUseType==0?'通用券':
                                                                               item2Coupon.couponUseType==1?'专车券':
-                                                                              item2Coupon.couponUseType==2?'出租券':'直通车券'}"
+                                                                              item2Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                               @}else{
                                                                               value=""
                                                                               @}
@@ -278,8 +278,8 @@
                                                 <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