Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台-政务master

# Conflicts: # epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
3 years ago · 8f87df55d8
2 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java
@ -30,7 +30,7 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo {
    /**
     * 身份证号
     */
-    @Excel(name = "身份证号")
+    @Excel(name = "证件号")
    private String idCard;

    /**
--- a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx