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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

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

@@ -22,9 +22,9 @@
    }else if(couponUseType==2){
        $("#id3").val(id);
        $("#num7").val(money);
    }else if(couponUseType==3){
    }else if(couponUseType==4){
        $("#id4").val(id);
        $("#num9").val(money);
        $("#num7").val(money);
    }
}