Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TempDirectorTrainingCampDetailWrapper.java

@@ -87,7 +87,7 @@ public class TempDirectorTrainingCampDetailWrapper {
 
         @ApiModelProperty(value = "身份证号")
         @NotEmpty(message = "身份证号不能为空")
-        @Pattern(regexp = "^(\\d{15}|\\d{17}[\\dXx])$", message = "身份证号格式不正确")
+        @Pattern(regexp = "(^\\d{6}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X|x)$)|(^\\d{6}\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}$)", message = "身份证号格式不正确")
         private String cardNo;
 
         @ApiModelProperty(value = "省份")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderRepairServiceImpl.java

@@ -112,8 +112,8 @@ public class MusicGroupPaymentCalenderRepairServiceImpl extends BaseServiceImpl<
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
                         MessageTypeEnum.SMS_WAIT_REMINDER_PAYMENT, receivers, null, 0, null, null,messageDto.getSchoolName(),messageDto.getBatchNo());
             }
-            List<Integer> ids = messageDtos.stream().map(e -> e.getId()).collect(Collectors.toList());
-            musicGroupPaymentCalenderRepairDao.updateSendRemind(ids);
+//            List<Integer> ids = messageDtos.stream().map(e -> e.getId()).collect(Collectors.toList());
+//            musicGroupPaymentCalenderRepairDao.updateSendRemind(ids);
         }
     }