From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
index 5ec5882..88dd5ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -68,4 +68,41 @@
 
     @ApiModelProperty(value = "每页记录数")
     private Long pageSize;
+
+    @ApiModelProperty(value = "关键词")
+    private String keyWord;
+
+    @ApiModelProperty(value = "党委标签(1.社区党委 2.区域党委委员)")
+    private Integer type;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "入党时间")
+    private Date joinTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "转正时间")
+    private Date employmentTime;
+
+    @ApiModelProperty(value = "职能")
+    private String function;
+
+    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
+    private Integer specialtyCategory;
+
+    @ApiModelProperty(value = "特长描述")
+    private String specialtyName;
+
+    @ApiModelProperty(value = "报道单位id")
+    private Long checkUnitId;
+
+    @ApiModelProperty(value = "报道单位名称")
+    private String checkUnitName;
+
+    @ApiModelProperty(value = "负责党组织id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "负责党组织名字")
+    private String orgName;
+
+    @ApiModelProperty(value = "身份证")
+    private String idCard;
 }

--
Gitblit v1.7.1