fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

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

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

    boolean expireActivityCouponTemplateAll();
}