From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +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/service/UserPointsMerchandiseService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
index 76b505b..ab0122f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
@@ -1,6 +1,8 @@
 package com.dsh.activity.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.BillingDataRequestVo;
+import com.dsh.activity.entity.ConsumeDetail;
 import com.dsh.activity.entity.CourseChangeStateDTO;
 import com.dsh.activity.entity.UserPointsMerchandise;
 import com.dsh.activity.model.PointMerchandiseIncomeVo;
@@ -22,4 +24,6 @@
     List<PointMerchandiseIncomeVo> getAmount();
 
     Object changeState(CourseChangeStateDTO dto);
+
+    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
 }

--
Gitblit v1.7.1