From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 fd4ba43..14b95fb 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
@@ -114,7 +114,6 @@
private String contactName;
@ApiModelProperty("联系人电话")
- @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
private String contactPhone;
@ApiModelProperty("是否签到 1 是 0否")
@@ -181,7 +180,7 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -242,5 +241,48 @@
private Integer codeType;
@ApiModelProperty("活动类型")
+ @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
private String activityType;
+
+ private String areaCode;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
+
+ @ApiModelProperty("项目Id")
+ private Long projectId;
+
+ @ApiModelProperty("项目名称")
+ private String projectName;
+
+ @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;
}
--
Gitblit v1.7.1