Merge remote-tracking branch 'origin/dev' into dev

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java

@@ -245,6 +245,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean cancel(RewardRedeemIdReqVO req) {
         //取消兑换 状态改为已取消 回退扣减的积分 ，如果存在已过期的积分，则直接过期
         if (req.getId() == null) {