From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index 2f1c2e9..52bf8e3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -264,9 +264,9 @@
}
@Override
- public PageInfo<UserPointDetailVO> getUserPontDetailPageList(Collection<Integer> types, Long id, Integer pageCurr, Integer pageSize) {
+ public PageInfo<UserPointDetailVO> getUserPontDetailPageList(Collection<Integer> types,String objectIdStr, Long id, Integer pageCurr, Integer pageSize) {
PageInfo<UserPointDetailVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
- List<UserPointDetailVO> list =baseMapper.getUserPontDetailPageList(pageInfo,id,types);
+ List<UserPointDetailVO> list =baseMapper.getUserPontDetailPageList(pageInfo,objectIdStr,id,types);
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1