Merge remote-tracking branch 'origin/develop' into release_temp

3 years ago · 2c2636e947
3 changed files with 2 additions and 2 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@ -541,12 +541,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res

        if (StringUtils.isNotBlank(idCard) && idCard.length() > 18) {
            // 身份证号超长了哦，不可以的
-            errors.add("身份证号过长，限制18位");
+            errors.add("身份证号过长");
        }

        if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) {
            // 手机号超长也是不可以的
-            errors.add("手机号过长，限制15位");
+            errors.add("手机号过长");
        }

        if (errors.size() > 0) {
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx