From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java |   13 ++++++++++---
 1 files changed, 10 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 de67325..14b95fb 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
@@ -246,6 +246,9 @@
 
     private String areaCode;
 
+    @ApiModelProperty("单次活动时长(小时)")
+    private Integer duration;
+
     @ApiModelProperty("项目Id")
     private Long projectId;
 
@@ -273,9 +276,13 @@
     @ApiModelProperty("签退范围,默认0无限制")
     private Integer signOutRange;
 
-    @ApiModelProperty("单次活动时长")
-    private Integer activityTime;
-
     @ApiModelProperty("1签到 2签退")
     private Integer signType;
+
+    @ApiModelProperty("是否可以评价 1是 0 否")
+    private Integer isComment;
+
+    private Integer signCount;
+
+    private Integer registerCount;
 }

--
Gitblit v1.7.1