Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java

@@ -61,4 +61,12 @@
    List<CouponTemplateVO> getVipList(@Param("param") QueryCouponDTO dto);

    List<CouponTemplateVO> getCouponTemplateVipPage(Page page, @Param("param") QueryCouponDTO dto);

    CouponTemplateVO getHomeActivityEffectAlert(@Param("param") QueryActivityEffectCouponDTO dto);

    void expireHomeActivityCouponTemplate();

    int expireActivityCouponTemplateAll();

    List<CouponTemplateVO> getActivityEffectListWithMine(@Param("param") QueryActivityEffectCouponDTO dto);
}