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

陶杰

2024-12-25 51eac60f5d04af43f93590ad2219f9bdda313745

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

@@ -101,4 +101,6 @@
    CouponTemplateVO getHomeActivityEffectAlert(QueryActivityEffectCouponDTO dto);

    boolean expireActivityCouponTemplateAll();

    List<CouponTemplateVO> getActivityEffectListWithMine(QueryActivityEffectCouponDTO dto);
}