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/SignactivityVO.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
index a6c2d40..2af137c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
@@ -1,5 +1,9 @@
 package com.panzhihua.common.model.vos.community;
 
+import javax.validation.constraints.Min;
+
+import com.panzhihua.common.validated.AddGroup;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,14 +18,18 @@
 @ApiModel("报名活动")
 public class SignactivityVO {
 
-    @ApiModelProperty(value = "类型 1 报名 2 取消报名",example = "1",required = true)
+    @ApiModelProperty(value = "类型 1 报名 2 取消报名", example = "1", required = true)
+    @Min(value = 1, groups = {AddGroup.class}, message = "操作类型不能为空")
     private Integer type;
-    @ApiModelProperty(value = "是否志愿者 0 否 1 是",example = "1",required = true)
+    @ApiModelProperty(value = "以什么身份报名活动 1 志愿者 0 普通居民", example = "1", required = true)
+    @Min(value = 0, groups = {AddGroup.class}, message = "报名身份不能为空")
     private Integer isVolunteer;
-    @ApiModelProperty(value = "活动主键",required = true)
+    @ApiModelProperty(value = "活动主键", required = true)
+    @Min(value = 1, groups = {AddGroup.class}, message = "活动主键不能为空")
     private Long activityId;
-    @ApiModelProperty(value = "当前登录用户id",hidden = true)
+    @ApiModelProperty(value = "当前登录用户id", hidden = true)
     private Long userId;
-
+    @ApiModelProperty("取消原因")
+    private String reason;
 
 }

--
Gitblit v1.7.1