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/service/impl/CouponServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index a8cb69a..24c8dc4 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -141,8 +141,8 @@
}
@Override
- public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
- return this.baseMapper.listRecord(objectPage, id, ids, type);
+ public List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type) {
+ return this.baseMapper.listRecord(id, ids, type);
}
@Override
--
Gitblit v1.7.1