From 984c102eb4e632985e45b7c4be1545c53c87b589 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 十二月 2024 21:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v5' into master-v5

---
 src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java |    2 ++
 1 files changed, 2 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 66fe43f..65c9d4e 100644
--- a/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
+++ b/src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
@@ -67,4 +67,6 @@
     void expireHomeActivityCouponTemplate();
 
     int expireActivityCouponTemplateAll();
+
+    List<CouponTemplateVO> getActivityEffectListWithMine(@Param("param") QueryActivityEffectCouponDTO dto);
 }

--
Gitblit v1.9.3