From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 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 28211aa..05548ae 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
@@ -34,6 +34,12 @@
@ApiModelProperty("活动地址")
private String activityAddr;
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
@ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
private Integer status;
@@ -56,10 +62,13 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signUpEnd;
+ @ApiModelProperty("参加人群（多个以逗号隔开）")
+ private String aattendPeople;
+
@ApiModelProperty("志愿者人数下线")
private Integer volunteerMin;
- @ApiModelProperty("志愿者人数上限")
+ @ApiModelProperty("志愿者人数上限（不需要则不填写）")
private Integer volunteerMax;
@ApiModelProperty("当前志愿者数量")
@@ -68,7 +77,7 @@
@ApiModelProperty("参与者人数下线")
private Integer participantMin;
- @ApiModelProperty("参与者人数上限")
+ @ApiModelProperty("参与者人数上限（不填写则默认不限人数）")
private Integer participantMax;
@ApiModelProperty("当前参与者数量")
@@ -79,6 +88,25 @@
@ApiModelProperty("是否有奖品 1 有 0 无")
private Integer hasPrize;
+
+ @ApiModelProperty("是否二维码签到 1 是 0否")
+ private Integer isQrCode;
+
+ @ApiModelProperty("用户最近签到时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activitySignInDate;
+
+ @ApiModelProperty("联系人姓名")
+ private String contactName;
+
+ @ApiModelProperty("联系人电话")
+ private String contactPhone;
+
+ @ApiModelProperty("是否签到 1 是 0否")
+ private Integer isRegist;
+
+ @ApiModelProperty("是否顶部 1 是 0否")
+ private Integer isTop;
@ApiModelProperty("奖品备注")
private String prizeRemark;
@@ -91,6 +119,21 @@
@ApiModelProperty("活动奖品集合")
private List<ComActActPrizeVO> comActActPrizeVOList;
+
+ @ApiModelProperty("活动评价集合")
+ private List<ComActActEvaluateVO> comActActEvaluateVOList;
+
+ @ApiModelProperty("活动评价总数")
+ private Integer evaluateAmount;
+
+ @ApiModelProperty("活动评分星级平均数")
+ private Double evaluateLevel;
+
+ @ApiModelProperty("当前用户对活动的评分")
+ private Integer myRating;
+
+ @ApiModelProperty("活动是否已默认好评")
+ private Integer isDefaultPraise;
@ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
@@ -114,7 +157,7 @@
private Integer isVolunteer = 0;
@ApiModelProperty(value = "当前登录者id", hidden = true)
- private Integer userId;
+ private Long userId;
@ApiModelProperty("活动参加普通人员集合")
private List<ActivitySignVO> activitySignVOList;
--
Gitblit v1.7.1