From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 33e9ddf..d84efa5 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
@@ -22,35 +22,35 @@
Map<String, Object> queryConponRuleOfJson(@Param("id") Integer id);
- List<Map<String, Object>> queryCouponListOfSearch(@Param("name")String name,
- @Param("type")Integer type,
- @Param("distributionMethod")Integer distributionMethod,
- @Param("userPopulation")Integer userPopulation,
- @Param("status")Integer status,
- @Param("state")Integer state,
+ List<Map<String, Object>> queryCouponListOfSearch(@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("cityCode") String cityCode,
- @Param("storeId")Integer storeId,
- @Param("operatorId")Integer operatorId,
- @Param("objType")Integer objType);
+ @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>> 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,
+ List<Map<String, Object>> queryCouponExamineList(@Param("name") String name,
+ @Param("type") Integer type,
@Param("userPopulation") Integer userPopulation,
- @Param("distributionMethod")Integer distributionMethod,
- @Param("auditStatus")Integer auditStatus,
- @Param("page")Page<Map<String, Object>> page);
+ @Param("distributionMethod") Integer distributionMethod,
+ @Param("auditStatus") Integer auditStatus,
+ @Param("page") Page<Map<String, Object>> page);
List<Map<String, Object>> listRecord(@Param("objectPage") Page<Object> objectPage, @Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("type") Integer type);
--
Gitblit v1.7.1