Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel

puzhibing

2024-02-07 28e3ff6cfc3d21d3e99d769b4105819a75afc063

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html

@@ -80,7 +80,7 @@
                                                                              @if(isNotEmpty(item1Coupon)){
                                                                              value="${item1Coupon.couponUseType==0?'通用券':
                                                                              item1Coupon.couponUseType==1?'专车券':
                                                                              item1Coupon.couponUseType==2?'出租券':'跨城出行券'}"
                                                                              item1Coupon.couponUseType==2?'出租券':'包裹优惠劵'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}
@@ -178,7 +178,7 @@
                                                                              @if(isNotEmpty(item2Coupon)){
                                                                              value="${item2Coupon.couponUseType==0?'通用券':
                                                                              item2Coupon.couponUseType==1?'专车券':
                                                                              item2Coupon.couponUseType==2?'出租券':'跨城出行券'}"
                                                                              item2Coupon.couponUseType==2?'出租券':'包裹优惠券'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}