From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
index 57999ba..fd14e01 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
+++ b/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);
 }

--
Gitblit v1.7.1