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

zhibing.pu

2024-08-23 1e630a0e74dab5ae9e2704de890bbb16b951ec99

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

    /**
     * 获取充值记录