From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index def407c..33c6cac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -42,10 +42,10 @@
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date publishAt;
-
@ApiModelProperty("活动结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endAt;
+
@ApiModelProperty("活动开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -98,6 +98,9 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
@ApiModelProperty(value = "当前页数",example="1")
private Long pageNum;
@@ -116,8 +119,11 @@
@ApiModelProperty(value = "当前登录者id",hidden = true)
private Integer userId;
- @ApiModelProperty("活动参加人员集合")
+ @ApiModelProperty("活动参加普通人员集合")
private List<ActivitySignVO>activitySignVOList;
+
+ @ApiModelProperty("活动参加志愿者人员集合")
+ private List<ActivitySignVO>activityVolunteerList;
@ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
private Integer type;
@@ -126,12 +132,23 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty(value = "是否是小程序访问 1 是 0 不是",hidden = true)
+ @ApiModelProperty(value = "是否是小程序访问 1 是 ",hidden = true)
private Integer isApplets;
@ApiModelProperty("活动积分")
private Integer integral;
+ @ApiModelProperty(value = "是不是请求进行中 1 是",hidden = true)
+ private Integer isIng;
+ @ApiModelProperty("用户实际报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date singDate;
+
+ @ApiModelProperty("党员活动是否个人发布 1 是 0 否")
+ private Integer isPerson;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
}
--
Gitblit v1.7.1