From df1d7f501609c6bc39cea5a3220d240e4666ade3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 29 Aug 2022 18:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?=
 =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/IcVaccinePrarmeterImportExcel.java  |   2 +-
 .../IcVaccinePrarmeterImportErrorModel.java   |   2 +-
 .../impl/IcVaccinePrarmeterServiceImpl.java   |   2 +-
 .../excel/ic_vaccine_prarmeter_excel.xls      | Bin 20480 -> 19968 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java
index 893531a4d2..3d9ed7a6a7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java
@@ -39,7 +39,7 @@ public class IcVaccinePrarmeterImportExcel {
     @Excel(name = "联系电话")
     private String mobile;
 
-    @Excel(name = "身份证号")
+    @Excel(name = "证件号")
     private String idCard;
 
     @Excel(name = "是否接种", replace = {"否_0","是_1"})
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java
index 7d34af62aa..8cce05d852 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java
@@ -41,7 +41,7 @@ public class IcVaccinePrarmeterImportErrorModel {
     @Excel(name = "联系电话",width = 30)
     private String mobile;
 
-    @Excel(name = "身份证号",width = 30)
+    @Excel(name = "证件号",width = 30)
     private String idCard;
 
     @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"})
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
index a5600b7f77..08e03f063f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
@@ -303,7 +303,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                 continue;
             }
             if (StringUtils.isBlank(list.get(i).getIdCard()) && !list.get(i).getAddStatus()){
-                errorInfo.add(getErrorInfo(list.get(i), "身份证号不能为空",i+1));
+                errorInfo.add(getErrorInfo(list.get(i), "证件号不能为空",i+1));
                 list.get(i).setAddStatus(true);
                 continue;
             }
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_vaccine_prarmeter_excel.xls
index 52b29028aec920e29760ecac68f74fe93bb8a511..539b291220fe5118f8699027686c32e59386557b 100644
GIT binary patch
delta 236
zcmZozz}PT{ae@t_;zrx!jEpLiS(&PN|NZ~}AB2?|7#LJHPh`qxoS48ei6w{g0H-x?
z|Lz-%N|Q@jnwj3)Z2rZv)P#|9@&Ze7sq2<N)eLNm!3-G;sX$o5V8qbMAi|JrJ^7-g
z6Z0R22a~g`BH5W47!P)T^P7Ces-01Oa)`Atlexv@i%y?5SKG)iP42YU*JWkk02;)|
zzzT#M95Wf17#KJ=F$yuTfXoL2pws??c>5TQC;K~yPS$l$WON3zE;{H>eq?Vt+0P++
XlcNXACO2DF7M(vl{hJ-V_p<;1j<HCD

delta 543
zcmX|7JxE(o6#mZ5O?WXWc_wX@B3S>5p_9f|jrlRLXato)htfe@6od*6(Jl@u8afn3
zawj2!gHBHMErLUIa!n?k9lGdnaTGP4`;0x0^S<w#_q}`0ch^d^wnsY&YX6%&C+bpO
zvC`NE;IUS#ne1f#!PydvRFn(;N?v^`oLo|eT9zB4KjqxXgFc#3dxK5yT8CH)AAQ3-
z=J;7cFA8{#!-T31X1`zKD?)(I85Ml`y@4R$VGx{DPgB3d2m-p9i*?EXR+((rIHh6c
zHL_sg9#`sZ{D)tH4!0ks&i<%h@!ynJkMWq;8c+}ETc<10B6@DH&$ERt@mV%3Z84ge
zLW27qy~#WTsk<2oer>BZ8Cex*aFt+{x2~9AEC!$Z=5I6rG2SxFbQO{$m3c1<Wwv1)
z+3puYfH|9W^A#h|sLgvCqj-ZbUy}ftd;cH7kKBBTS@$rrJRwr=6Ub+5Sja&oQ?Y2!
zokBc=Szy;V^dC{!tX~h~nJd+l{;W!=el?l?sj8_lRmrwG7wM=hjvOC-NqS}RUtht=
HjF;sTJvC&J