From da4751c6bd5fec4e481a40bd2d385c1ec2268b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Sat, 28 Mar 2020 13:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/excel/MetaUserGridOpiningExcel.java  | 18 +--------------
 .../user/excel/MetaUserPartyRankExcel.java    | 22 +------------------
 .../user/excel/MetaUserRegisterRankExcel.java | 22 +------------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
index d5eb48161..104301f23 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
@@ -73,23 +73,7 @@ public class MetaUserGridOpiningExcel {
     @Excel(name = "好评数")
     private int itemPraiseCount;
 
-
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
index c312a5f13..7700c7b3a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
@@ -32,11 +32,6 @@ import java.util.Date;
 @Data
 public class MetaUserPartyRankExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "街道id")
-    private String streetId;
 
     @Excel(name = "街道名称")
     private String streetName;
@@ -68,22 +63,7 @@ public class MetaUserPartyRankExcel {
     @Excel(name = "党员认证失败数")
     private Integer partyAuthFailureCount;
 
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
index fba1d7a65..7fd0c6793 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
@@ -32,11 +32,6 @@ import java.util.Date;
 @Data
 public class MetaUserRegisterRankExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "街道id")
-    private String streetId;
 
     @Excel(name = "街道名称")
     private String streetName;
@@ -74,22 +69,7 @@ public class MetaUserRegisterRankExcel {
     @Excel(name = "未知性别")
     private Integer unknownSexCount;
 
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;