Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-10-23 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4

 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,