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

cloudroam

2024-10-12 021fcaca65cc87874e216630153e17455acaabce

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

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

    boolean expireActivityCouponTemplateAll();
}