From 336cc1da02624db3d42ad09187b6b51b98ee35dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:20:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
index 605dc03..45cc535 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.activity.entity.BillingDataRequestVo;
+import com.dsh.activity.entity.ConsumeDetail;
 import com.dsh.activity.entity.UserPointsMerchandise;
 import com.dsh.activity.model.PointMerchandiseIncomeVo;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +26,6 @@
 
 
     Object changeState(List<Integer> ids, Integer state);
+
+    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
 }

--
Gitblit v1.7.1