From 4dcc6b5c1e521021c01de45c4b6ba08d50a8c0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 3 Jan 2020 16:50:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/excel/PartyMembersExcel.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java index 861156532..5cf674f62 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java @@ -49,18 +49,12 @@ public class PartyMembersExcel { @Excel(name = "是否注册", replace = {"是_1", "否_0"}) private String registFlag; - @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss") private Date registTime; - @Excel(name = "街道") - private String streetName; - - @Excel(name = "社区") - private String communityName; - - @Excel(name = "网格") - private String gridName; + @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; - @Excel(name = "所在党组织") - private String partyOrganization; + @Excel(name = "街道-社区-网格") + private String allDeptNames; } \ No newline at end of file From 7cffd9413a1b1a5667be278a0d8d52b69ded27cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 3 Jan 2020 16:57:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/excel/PartyAuthenticationFailedExcel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java index 9b2065bea..65ef33b67 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java @@ -35,18 +35,18 @@ public class PartyAuthenticationFailedExcel { @Excel(name = "姓名") private String realName; - @Excel(name = "手机号") - private String mobile; - @Excel(name = "身份证号") private String identityNo; - @Excel(name = "认证时间") - private Date createdTime; + @Excel(name = "手机号") + private String mobile; @Excel(name = "所属网格") private String allDeptNames; + @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + @Excel(name = "居民住址") private String address;