From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
index b622619..091436a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
@@ -28,7 +28,11 @@
@Param("userPopulation")Integer userPopulation,
@Param("status")Integer status,
@Param("state")Integer state,
- @Param("page")Page<Map<String, Object>> page);
+ @Param("page")Page<Map<String, Object>> page,
+ @Param("cityCode") String cityCode,
+ @Param("storeId")Integer storeId
+
+ );
List<Map<String, Object>> queryCouponExamineList(@Param("name")String name,
@Param("type")Integer type,
--
Gitblit v1.7.1