Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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;
 

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;
 }