From 2ba0e4c222d707b163d97afb122d3183c99dbf7a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 02 十二月 2024 09:31:19 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5

---
 src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java b/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
index f8b8327..65c9d4e 100644
--- a/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
+++ b/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
@@ -65,4 +65,8 @@
     CouponTemplateVO getHomeActivityEffectAlert(@Param("param") QueryActivityEffectCouponDTO dto);
 
     void expireHomeActivityCouponTemplate();
+
+    int expireActivityCouponTemplateAll();
+
+    List<CouponTemplateVO> getActivityEffectListWithMine(@Param("param") QueryActivityEffectCouponDTO dto);
 }

--
Gitblit v1.9.3