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

Pu Zhibing

2024-10-22 009f795a6e93cbb94e4a316e0efa8cb7124743f5

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

@@ -460,7 +460,6 @@
UserActivityInfoDlg.selectRedOpt=function(id,type,totalMoney,money,startMoney,endMoney,effective){
    $("#content6Num1").val(type==1?"固定金额":"随机金额");
    $("#content6Num3").val(type==1?money:startMoney+"-"+endMoney);
    $("#content6Num4").val(effective);
    $("#content6RedId").val(id);
    $("#content6Num2").val(totalMoney);
}