From 5dc04f3291c00d66f8733a49896612ea1e3b31c5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 16 九月 2021 13:19:14 +0800
Subject: [PATCH] Merge branch 'test' into 'zzj'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 05548ae..bd0e1df 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -92,9 +93,8 @@
@ApiModelProperty("是否二维码签到 1 是 0否")
private Integer isQrCode;
- @ApiModelProperty("用户最近签到时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date activitySignInDate;
+ @ApiModelProperty("用户签到记录列表")
+ private List<ComActActRegistVO> activitySignInList;
@ApiModelProperty("联系人姓名")
private String contactName;
@@ -124,10 +124,10 @@
private List<ComActActEvaluateVO> comActActEvaluateVOList;
@ApiModelProperty("活动评价总数")
- private Integer evaluateAmount;
+ private Long evaluateAmount;
@ApiModelProperty("活动评分星级平均数")
- private Double evaluateLevel;
+ private BigDecimal evaluateLevel;
@ApiModelProperty("当前用户对活动的评分")
private Integer myRating;
--
Gitblit v1.7.1