From b6169fae531465dc60f3b5c8f841eb2dd7009eec Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 四月 2021 14:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
index 781676c..3485e57 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -16,7 +16,7 @@
@ApiModelProperty("活动主键")
private Long activityId;
- @ApiModelProperty("人员主键")
+ @ApiModelProperty("表主键")
private Long id;
@ApiModelProperty("名字")
private String name;
@@ -28,4 +28,10 @@
private String createAt;
@ApiModelProperty("人员头像")
private String imageUrl;
+ @ApiModelProperty(value = "是否是志愿者",hidden = true)
+ private Integer isVolunteer;
+ @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者",hidden = true)
+ private Integer type;
+ @ApiModelProperty("人员主键")
+ private Long userId;
}
--
Gitblit v1.7.1