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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

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

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

    boolean expireActivityCouponTemplateAll();
}