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/PointsMerchandiseMapper.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
index 889ccd6..87c590d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
@@ -20,24 +20,25 @@
*/
public interface PointsMerchandiseMapper extends BaseMapper<PointsMerchandise> {
- List<Map<String, Object>> queryGoodsListOfSearch(@Param("name")String name,
- @Param("type")Integer type,
- @Param("redemptionMethod")Integer redemptionMethod,
+ List<Map<String, Object>> queryGoodsListOfSearch(@Param("name") String name,
+ @Param("type") Integer type,
+ @Param("redemptionMethod") Integer redemptionMethod,
@Param("userPopulation") Integer userPopulation,
@Param("activeStatus") Integer activeStatus,
@Param("state") Integer state,
@Param("page") Page<Map<String, Object>> page);
- List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name")String name,
- @Param("type")Integer type,
- @Param("redemptionMethod")Integer redemptionMethod,
- @Param("userPopulation") Integer userPopulation,
- @Param("activeStatus") Integer activeStatus,
- @Param("state") Integer state,
- @Param("page") Page<Map<String, Object>> page);
+
+ List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name") String name,
+ @Param("type") Integer type,
+ @Param("redemptionMethod") Integer redemptionMethod,
+ @Param("userPopulation") Integer userPopulation,
+ @Param("activeStatus") Integer activeStatus,
+ @Param("state") Integer state,
+ @Param("page") Page<Map<String, Object>> page);
List<Map<String, Object>> ticketList(@Param("query") IntegralGoodsOfSearch ofSearch);
- void changeState(@Param("ids") List<Integer> ids ,@Param("state") Integer state);
+ void changeState(@Param("ids") List<Integer> ids, @Param("state") Integer state);
void saveCity(@Param("id") Integer id, @Param("province") String province, @Param("provinceCode") String provinceCode, @Param("city") String city, @Param("cityCode") String cityCode);
--
Gitblit v1.7.1