diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java index 39c20059a..c92e684ee 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java @@ -60,7 +60,7 @@ public class FlowPartyDTO implements Serializable { private Integer freelance; /** - * 是否党员 0、否 1、是 + * 是否党员 0、流入党员 1、流出党员 */ private Integer party; @@ -79,6 +79,11 @@ public class FlowPartyDTO implements Serializable { */ private String workAddr; + /** + * 居住地址 + */ + private String villageName; + /** * 居住网格id */ @@ -101,6 +106,11 @@ public class FlowPartyDTO implements Serializable { */ private String partyName; + /** + * 党支部地址 + */ + private String partyAddr; + /** * 审核意见 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java index 1a7079ed2..44d0fa665 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java @@ -53,12 +53,12 @@ public class FlowPartyEntity extends DeptScope { private String mobile; /** - * 是否自由职业 0、否 1、是 + * 是否自由职业 0、否 1、是 (废弃) */ private Integer freelance; /** - * 是否党员 0、否 1、是 + * 是否党员 0、流入党员 1、流出党员 */ private Integer party; @@ -94,6 +94,11 @@ public class FlowPartyEntity extends DeptScope { */ private String partyName; + /** + * 党支部地址 + */ + private String partyAddr; + /** * 审核意见 */