From 1aa70f3b0a1411d0de3f4ca78b639bf065168be2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 10 九月 2021 18:29:10 +0800
Subject: [PATCH] Merge branch 'zzj' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into discuss

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
index 1b17241..6c1a65f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -117,6 +117,9 @@
     @ApiModelProperty("每人票数")
     private Integer count;
 
+    @ApiModelProperty("议事投票评论列表")
+    private List<ComActDiscussCommentVO> discussCommentList;
+
     @ApiModelProperty("剩余可投票数")
     private Integer remainingVotes;
 
@@ -125,4 +128,12 @@
 
     @ApiModelProperty("已参与投票人数")
     private Integer votedPersonNum;
+
+    /**
+     * 类型 1 议事 2 投票
+     */
+    public interface type{
+        int ys = 1;
+        int tp = 2;
+    }
 }

--
Gitblit v1.7.1