From b1412a03ad6f68ab592f4599a318421966c556c2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 19 五月 2024 14:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
index 735f35f..f1f95dc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
@@ -319,7 +319,7 @@
}
Double logistics = uad.getLogistics();
if(null != special){
- map.put("package", logistics * 10);
+ map.put("delivery", logistics * 10);
}
Set<String> strings = map.keySet();
--
Gitblit v1.7.1