Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java

@@ -24,7 +24,7 @@ public class CollectListMemberExcelResultDTO implements Serializable {
     /**
      * 成员身份证
      */
-    @Excel(name = "成员身份证号", width = 30)
+    @Excel(name = "成员证件号", width = 30)
     private String memberIdNum;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java

@@ -23,7 +23,7 @@ public class ChangeDeathExcel {
     @Excel(name = "姓名")
     private String name;
 
-    @Excel(name = "身份证")
+    @Excel(name = "证件号")
     private String idCard;
 
     @Excel(name = "手机号")

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java

@@ -32,7 +32,7 @@ public class ChangeRelocationExcel {
     @Excel(name = "手机号")
     private String mobile;
 
-    @Excel(name = "身份证号")
+    @Excel(name = "证件号")
     private String idCard;
 
     @Excel(name = "性别")

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java

@@ -24,7 +24,7 @@ public class ChangeWelfareExcel {
     @Excel(name = "姓名")
     private String name;
 
-    @Excel(name = "身份证")
+    @Excel(name = "证件号")
     private String idCard;
 
     @Excel(name = "手机号")