From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java |    3 +++
 1 files changed, 3 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 81e58a7..011c310 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.activity.entity.UserPointsMerchandise;
+import com.dsh.activity.model.PointMerchandiseIncomeVo;
 import com.dsh.activity.model.request.PointMercharsPayedVo;
 
 import java.util.List;
@@ -17,4 +18,6 @@
  */
 public interface UserPointsMerchandiseService extends IService<UserPointsMerchandise> {
 
+    List<PointMerchandiseIncomeVo> getAmount();
+
 }

--
Gitblit v1.7.1