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

Pu Zhibing

2024-10-22 009f795a6e93cbb94e4a316e0efa8cb7124743f5

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java

@@ -83,6 +83,10 @@
             String beginTime,
             String endTime,
             Integer activityId);
    Map<String,Object> getDiscountStatic1(
             String beginTime,
             String endTime,
             Integer activityId);

    /**
     * 获取充值记录