From 4991803c78280508a478c4942b83bf63b48d307b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 17:45:58 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 202342e..cfa495b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -180,7 +180,7 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动 5服务活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -228,7 +228,6 @@
private Integer canCancel;
@ApiModelProperty("取消活动扣除积分数目")
- @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
private Integer cancelDeduct;
@ApiModelProperty("用户已参与次数")
@@ -241,10 +240,12 @@
private Integer codeType;
@ApiModelProperty("活动类型")
- @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
private String activityType;
private String areaCode;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
@ApiModelProperty("项目Id")
private Long projectId;
@@ -254,4 +255,43 @@
@ApiModelProperty("社工数")
private Integer socialCount;
+
+
+ /**
+ * 党员参与者人数下线
+ */
+ @ApiModelProperty("党员参与者人数下线")
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ @ApiModelProperty("党员参与者人数上限")
+ private Integer partyMemberMax;
+ /**
+ * 签退范围，默认0无限制
+ */
+ @ApiModelProperty("签退范围，默认0无限制")
+ private Integer signOutRange;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
+
+ @ApiModelProperty("是否可以评价 1是 0 否")
+ private Integer isComment;
+
+ private Integer signCount;
+
+ private Integer registerCount;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
+ @ApiModelProperty("关联服务id")
+ private Long relationId;
+ @ApiModelProperty("关联手机")
+ private String phone;
+ @ApiModelProperty("单位id")
+ private Long checkUnitId;
+
}
--
Gitblit v1.7.1