From 4f5d220cd175b1cb48c6fc91cb02cb12f6114746 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 18 八月 2025 11:10:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java | 2 ++
1 files changed, 2 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 45cc535..db8de27 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
@@ -28,4 +28,6 @@
Object changeState(List<Integer> ids, Integer state);
List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
+
+ List<ConsumeDetail> getConsumeDetails1(BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1