From bbda2ee1af4e86d76f93e00386d77efb56c60d5f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 23 七月 2022 15:42:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 2b606ca..645bf62 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;
@@ -44,6 +46,7 @@
@ApiModelProperty(value = "状态")
private String status;
@ApiModelProperty(value = "党员唯一标识id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "报名时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -57,7 +60,7 @@
@ApiModelProperty(value = "是否党员 1是 2否")
private Integer isPb;
- @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ @ApiModelProperty(value = "党员报道类型（1.在职干部 2.机关单位）")
private Integer type;
@ApiModelProperty(value = "职位")
@@ -72,7 +75,7 @@
@ApiModelProperty(value = "职能")
private String function;
- @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ @ApiModelProperty(value = "特长类别（1.统计调查 2.法律援助 3.志愿活动 4.尊老爱幼 5.宣讲宣教 6.心理关爱 7.设施维修 8.其他）")
private Integer specialtyCategory;
@ApiModelProperty(value = "特长描述")
@@ -86,4 +89,47 @@
@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