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/static/modular/system/userCouponRecord/userCouponRecord.js

@@ -28,7 +28,9 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
                        return "";
                    }
@@ -47,7 +49,7 @@
                    }
                }
            },
        {title: '使用时间', field: 'useTime', visible: true, align: 'center', valign: 'middle'}
        {title: '使用时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'}
    ];
};