From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java b/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
index b33de57..4924912 100644
--- a/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
+++ b/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);
 }

--
Gitblit v1.9.3