From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 2af137c..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
@@ -21,14 +21,16 @@
@ApiModelProperty(value = "类型 1 报名 2 取消报名", example = "1", required = true)
@Min(value = 1, groups = {AddGroup.class}, message = "操作类型不能为空")
private Integer type;
- @ApiModelProperty(value = "以什么身份报名活动 1 志愿者 0 普通居民", example = "1", required = true)
- @Min(value = 0, groups = {AddGroup.class}, message = "报名身份不能为空")
- private Integer isVolunteer;
+ @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)
private Long userId;
+ @ApiModelProperty(value = "单位id（党员以单位名义报名社区活动）")
+ private Long checkUnitId;
@ApiModelProperty("取消原因")
private String reason;
--
Gitblit v1.7.1