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/PointsMerchandiseMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 4183f97..49248dd 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,6 +27,13 @@
@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);
--
Gitblit v1.7.1