From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +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 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 59743fe..889ccd6 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
@@ -27,8 +27,19 @@
                                                      @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);
 
-    int changeState(@Param("query") CoachChangeStateVO dto);
+    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