Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 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