Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java

@@ -199,6 +199,12 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         costApply.setChangeActionTime(LocalDateTime.now());
         costApply.setCancelFlag(0);
         tbsCostApplyService.updateById(costApply);
+        //恢复原来的活动的取消状态
+        LambdaQueryWrapper<TbsActivity> updActLqw = new LambdaQueryWrapper<>();
+        updActLqw.eq(TbsActivity::getCostApplyId,costApply.getId());
+        TbsActivity updActEntity = new TbsActivity();
+        updActEntity.setCancelFlag(0);
+        tbsActivityMapper.update(updActEntity,updActLqw);
         //恢复原来的费用占用
         tbsBudgetLogMapper.updateLogDelFlagByCostApply(extCost.getChangeSourceId(),0);
         //删除当前的异动记录