Merge remote-tracking branch 'origin/master'

nickchange

2023-11-17 695ff7ec8bd12b6cf32b77902bd5cfb44419b835

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

@@ -45,7 +45,8 @@
    }

    @Override
    public Object changeState(CoachChangeStateVO dto) {
        return this.baseMapper.changeState(dto);
    public void changeState(CoachChangeStateVO dto) {
        List<Integer> ids = dto.getIds();
        this.baseMapper.changeState(ids,dto.getState());
    }
}