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 |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 5689774..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
@@ -92,6 +92,10 @@
     @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;
 
@@ -122,9 +126,15 @@
     @ApiModelProperty("活动评价总数")
     private Integer evaluateAmount;
 
-    @ApiModelProperty("评分星级")
+    @ApiModelProperty("活动评分星级平均数")
     private Double evaluateLevel;
 
+    @ApiModelProperty("当前用户对活动的评分")
+    private Integer myRating;
+
+    @ApiModelProperty("活动是否已默认好评")
+    private Integer isDefaultPraise;
+
     @ApiModelProperty(value = "社区id", hidden = true)
     private Long communityId;
 

--
Gitblit v1.7.1