From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:47:41 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 7223a0c..f087b23 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
@@ -24,14 +24,16 @@
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("以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
@ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
private Integer type;
@ApiModelProperty("人员主键")
@@ -42,4 +44,36 @@
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;
+
+ @ApiModelProperty("是否邀请参与")
+ private Boolean isInvite;
}
--
Gitblit v1.7.1