From 8e524f6e570fca66f670a8072edefc6ca2d4e2f9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 08:55:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java |   14 +++++++++++++-
 1 files changed, 13 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 091436a..66d5665 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
@@ -30,9 +30,21 @@
                                                       @Param("state")Integer state,
                                                       @Param("page")Page<Map<String, Object>> page,
                                                       @Param("cityCode") String cityCode,
+                                                      @Param("storeId")Integer storeId,
+                                                      @Param("operatorId")Integer operatorId,
+                                                      @Param("objType")Integer objType);
+
+    List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
+                                                      @Param("type")Integer type,
+                                                      @Param("distributionMethod")Integer distributionMethod,
+                                                      @Param("userPopulation")Integer userPopulation,
+                                                      @Param("status")Integer status,
+                                                      @Param("state")Integer state,
+                                                      @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