From a68f7e4893ba2fe73b1aef6d002afde6d4c7164c Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Sun, 2 Jul 2023 15:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/user/dto/party/ReportPartyDTO.java   |  5 +++
 .../epdc/party/entity/ReportPartyEntity.java  | 43 +++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
index aca589c71..edfc5b67c 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
@@ -59,6 +59,11 @@ public class ReportPartyDTO implements Serializable {
      */
 	private String deptId;
 
+    /**
+     * 单位报到联系社区名称
+     */
+    private String deptName;
+
     /**
      * 是否在市北居住
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
index d21b0d4f9..d98eb7625 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
@@ -29,80 +29,85 @@ import lombok.EqualsAndHashCode;
  * @since v1.0.0 2023-06-30
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("report_party")
 public class ReportPartyEntity extends DeptScope {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 党员姓名
      */
-	private String name;
+    private String name;
 
     /**
      * 身份证号码
      */
-	private String idCard;
+    private String idCard;
 
     /**
      * 联系电话
      */
-	private String mobile;
+    private String mobile;
 
     /**
      * 社区id
      */
-	private String deptId;
+    private String deptId;
 
-	/**
-	 * 是否在市北居住
-	 */
-	private Integer shiBei;
+    /**
+     * 单位报到联系社区名称
+     */
+    private String deptName;
+
+    /**
+     * 是否在市北居住
+     */
+    private Integer shiBei;
 
     /**
      * 居住小区名称
      */
-	private String homeName;
+    private String homeName;
 
     /**
      * 现工作单位
      */
-	private String workUnit;
+    private String workUnit;
 
     /**
      * 工作单位性质
      */
-	private String workType;
+    private String workType;
 
     /**
      * 工作单位行业
      */
-	private String workIndustry;
+    private String workIndustry;
 
     /**
      * 特长
      */
-	private String specialty;
+    private String specialty;
 
     /**
      * 是否党员 0、否  1、是
      */
-	private Integer party;
+    private Integer party;
 
     /**
      * 是否愿意加入志愿者 0、否  1、是
      */
-	private Integer volunteer;
+    private Integer volunteer;
 
     /**
      * 是否愿意加入网格员 0、否 1、是
      */
-	private Integer gridStaff;
+    private Integer gridStaff;
 
     /**
      * 是否愿意加入业务委员会 0、否  1、是
      */
-	private Integer owners;
+    private Integer owners;
 
 }