From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 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 1de733e..2b606ca 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
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.partybuilding;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,17 +21,17 @@
private String name;
@ApiModelProperty(value = "身份证")
private String idCard;
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "入党时间")
private Date joinTime;
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "转正时间")
private Date employmentTime;
@ApiModelProperty(value = "所属党组织id")
private Long orgId;
@ApiModelProperty(value = "头像图片路径")
private String photoPath;
- @ApiModelProperty(value = "社区ID",hidden=true)
+ @ApiModelProperty(value = "社区ID", hidden = true)
private Long communityId;
@ApiModelProperty(value = "社区名字")
private String communityName;
@@ -47,8 +48,42 @@
@ApiModelProperty(value = "报名时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty(value = "用户ID",hidden=true)
+ @ApiModelProperty(value = "用户ID", hidden = true)
private Long userId;
@ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
private Integer auditResult;
+ @ApiModelProperty(value = "驳回原因")
+ private String refuseReason;
+ @ApiModelProperty(value = "是否党员 1是 2否")
+ private Integer isPb;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "活动时长")
+ private Integer partyTime;
+
+ @ApiModelProperty(value = "活动积分")
+ private Integer partyInterval;
}
--
Gitblit v1.7.1