合并分支 'qa' 到 'master'

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -133,7 +133,7 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
     private List<ActivityPlanInfoDto> getRowByCSJLUp(ActivityPlanVo planVo, List<Object> row,Map<String, Object> rMap) {
         List<ActivityPlanInfoDto> dtos = new ArrayList<>();
         LocalDate now = LocalDate.now();
-//        int monthValue = now.getMonthValue();
+        int monthValue = now.getMonthValue();
         int nextMonthValue = now.plusMonths(1).getMonthValue();
 
         /**
@@ -208,10 +208,10 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                     year += 1;
                 }
                 LocalDate planDate = LocalDate.of(year, month, day);
-//                if (monthInt != nextMonthValue && monthInt != monthValue) {
-//                    dto.setErrorMsg("月份只能是当月或次月；");
-                if (monthInt != nextMonthValue) {
-                    dto.setErrorMsg("月份只能是次月；");
+                if (monthInt != nextMonthValue && monthInt != monthValue) {
+                    dto.setErrorMsg("月份只能是当月或次月；");
+//                if (monthInt != nextMonthValue) {
+//                    dto.setErrorMsg("月份只能是次月；");
                 } else if (planDate.isBefore(LocalDate.now())) {
                     dto.setErrorMsg("日期不能是以前；");
                 } else {