Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js

@@ -22,11 +22,11 @@
            {title: '优惠券类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    if(value==0){
                        return "通用券";
                        return "通用优惠券";
                    }else if(value==1){
                        return "专车券";
                    }else if(value==2){
                        return "出租券";
                        return "打车优惠券";
                    }else if(value==4){
                        return "包裹优惠券";
                    }else if(value==3){
                        return "跨城出行券";
                    }else{