From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 12 +++++++++---
1 files changed, 9 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 d3239dc..a969be1 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
@@ -77,7 +77,6 @@
private Date signUpEnd;
@ApiModelProperty("参加人群（多个以逗号隔开）")
- @NotBlank(groups = AddGroup.class, message = "参加人群不可为空")
private String aattendPeople;
@ApiModelProperty("志愿者人数下线")
@@ -222,7 +221,7 @@
@ApiModelProperty("参与签到/打卡奖励积分")
private Integer rewardIntegral;
- @ApiModelProperty("参与次数上限，按次奖励需传入")
+ @ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
private Integer limit;
@ApiModelProperty("是否允许取消（1.允许 2.不允许）")
@@ -233,9 +232,16 @@
@NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
private Integer cancelDeduct;
- @ApiModelProperty("参与次数")
+ @ApiModelProperty("用户已参与次数")
private Integer times;
@ApiModelProperty("已获取积分")
private Integer award;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+ @ApiModelProperty("活动类型")
+ @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
+ private String activityType;
}
--
Gitblit v1.7.1