Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-11 606e7c14e9a73c20028896f4e681a3f2c42e20fc

 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();