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/dao/UserCouponRecordMapper.java

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

    List<Map<String,Object>> getBlanceList(@Param("page") Page<Map<String, Object>> page,
                                     @Param("beginTime") String beginTime,