From 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:15:33 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
index 660afd0..93ef12a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -57,7 +59,7 @@
@ApiModelProperty(value = "是否党员 1是 2否")
private Integer isPb;
- @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ @ApiModelProperty(value = "党员报道类型（1.在职干部 2.机关单位）")
private Integer type;
@ApiModelProperty(value = "职位")
@@ -87,9 +89,46 @@
@ApiModelProperty(value = "活动积分")
private Integer partyInterval;
+ @ApiModelProperty(value = "帮扶社区id")
+ private Long helpCommunityId;
+ @ApiModelProperty(value = "帮扶社区名字")
+ private String helpCommunityName;
+ @ApiModelProperty(value = "帮扶社区手机号")
+ private String helpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String helpCommunityContactsName;
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+ @ApiModelProperty(value = "报道单位联系人手机号")
+ private String contacts;
+ @ApiModelProperty(value = "报道单位联系人")
+ private String contactsName;
+
+ private String natureName;
+
+ private Integer natureId;
+
+ private String address;
+
@ApiModelProperty(value = "分页-当前页数", example = "1")
private Long pageNum = 1L;
@ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "其他备注")
+ private String otherRemark;
+ @ApiModelProperty(value = "报道单位下沉小区")
+ private String unitVillageName;
+ @ApiModelProperty(value = "报道单位服务社区")
+ private String unitHelpCommunityName;
+ @ApiModelProperty(value = "报道单位社区电话")
+ private String unitHelpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String unitHelpCommunityContactsName;
+ @ApiModelProperty("区级")
+ private String belongTo;
}
--
Gitblit v1.7.1