合并代码

puzhibing

2024-03-06 fba3b84ee4e8b60f1536c50d032e4f199ec172a2

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java

@@ -30,7 +30,8 @@

    @Override
    public List<PointMerchandiseIncomeVo> getAmount() {
        return userPointsMerchandiseMapper.getAmount();
        List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
        return amount;
    }

    @Override