From 89fbd663dfd75507d55e2335ca856e4340bb01b3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 24 Aug 2022 14:03:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/ChangeDeathExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- .../src/main/java/com/epmet/excel/ChangeWelfareExcel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java index a198ceee2d..5ad2165e88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeDeathExcel.java +++ b/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 = "手机号") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 1823d569e2..554d776ac9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/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 = "性别") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index 99437aa726..acb7705b2f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/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 = "手机号") From b3316e2209be51514bca08b704d6873c35a94252 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 24 Aug 2022 14:50:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CollectListMemberExcelResultDTO.java | 2 +- .../src/main/java/com/epmet/excel/ChangeRelocationExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 89742845fa..f94a7dc803 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java index 554d776ac9..3b875fd0cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeRelocationExcel.java +++ b/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 = "性别")