From 706277afc2f3e2d15dd0f8b297a91c4b9a902897 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:19:22 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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..a2a491c 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,20 @@
@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)
- private Integer isVolunteer;
- @ApiModelProperty(value = "活动主键",required = true)
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）", example = "1", required = true)
+ @Min(value = 1, groups = {AddGroup.class}, message = "报名身份不能为空")
+ private Integer signIdentity;
+ @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(value = "单位id（党员以单位名义报名社区活动）")
+ private Long checkUnitId;
+ @ApiModelProperty("取消原因")
+ private String reason;
}
--
Gitblit v1.7.1