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

陶杰

2024-12-11 b1bef8fac3c0553f87b7047673123b23b68daa49

 src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java

@@ -100,4 +100,7 @@
     */
    CouponTemplateVO getHomeActivityEffectAlert(QueryActivityEffectCouponDTO dto);

    boolean expireActivityCouponTemplateAll();

    List<CouponTemplateVO> getActivityEffectListWithMine(QueryActivityEffectCouponDTO dto);
}