Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 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>