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/ActivitySignVO.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 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..f40d467 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,16 +16,61 @@
@ApiModelProperty("活动主键")
private Long activityId;
- @ApiModelProperty("人员主键")
+ @ApiModelProperty("表主键")
private Long id;
@ApiModelProperty("名字")
private String name;
+ @ApiModelProperty("用户昵称")
+ private String nickName;
@ApiModelProperty("身份")
private String identity;
+ @ApiModelProperty("人群标签")
+ private String tags;
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("报名时间")
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;
+ @ApiModelProperty("用户openid")
+ private String openid;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+ /**
+ * 报名状态 0 已取消 1已报名
+ */
+ @ApiModelProperty("报名状态 0 已取消 1已报名")
+ private Integer status;
+
+ /**
+ * 取消原因
+ */
+ @ApiModelProperty("取消原因")
+ private String reason;
+
+ /**
+ * 参与次数
+ */
+ @ApiModelProperty("参与次数")
+ private Integer times;
+
+ /**
+ * 获取奖励
+ */
+ @ApiModelProperty("获取奖励")
+ private Integer award;
+
+ /**
+ * 活动限制次数
+ */
+ @ApiModelProperty("活动限制次数")
+ private Integer limit;
}
--
Gitblit v1.7.1