From 1d3134d07c0351bdcc35e58a585c6d6e78571a94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:39:15 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
index 1300c06..53b18ea 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
@@ -27,15 +27,17 @@
public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {
@Autowired
private UserPointsMerchandiseMapper userPointsMerchandiseMapper;
+
@Override
public List<PointMerchandiseIncomeVo> getAmount() {
- return userPointsMerchandiseMapper.getAmount();
+ List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
+ return amount;
}
@Override
public Object changeState(CourseChangeStateDTO dto) {
List<Integer> ids = dto.getIds();
- return this.baseMapper.changeState(ids,dto.getState());
+ return this.baseMapper.changeState(ids, dto.getState());
}
@Override
--
Gitblit v1.7.1