From 20b528c879f3e96bf72516f58ac7341b204b12be Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 17:13:44 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java | 76 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
index defd96e..958e7bd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
@@ -29,4 +29,80 @@
@ApiModelProperty(value = "性别（1.是 2.否）")
private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "党龄")
+ private Integer partyAge;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "所属党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "所属党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "总活动次数")
+ private Integer activityCount;
+
+ @ApiModelProperty(value = "总活动时长（小时）")
+ private Integer activityDuration;
+
+ @ApiModelProperty(value = "党员活动次数")
+ private Integer partyActivityCount;
+
+ @ApiModelProperty(value = "党员活动时长（小时）")
+ private Integer partyActivityDuration = 0;
+
+ @ApiModelProperty(value = "党员活动积分数量")
+ private Integer partyActivityIntegral;
+
+ @ApiModelProperty(value = "志愿者活动次数")
+ private Integer volunteerActivityCount;
+
+ @ApiModelProperty(value = "志愿者活动时长（小时）")
+ private Integer volunteerActivityDuration;
+
+ @ApiModelProperty(value = "志愿者活动积分数量")
+ private Integer volunteerActivityIntegral;
+
+ @ApiModelProperty(value = "完成微心愿数量")
+ private Integer wishCount;
+
+ @ApiModelProperty(value = "完成随手拍数量")
+ private Integer easyCount;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
}
--
Gitblit v1.7.1