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/PartyBuildingMemberVO.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 91bf14d..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
@@ -56,4 +56,34 @@
     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