From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
index 7f71c4a..03d5812 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
@@ -1,6 +1,7 @@
 package com.panzhihua.service_community.model.dos;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.panzhihua.common.model.vos.community.ComActVO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -26,7 +27,7 @@
     /**
      * 主题
      */
-    private String subject;
+    private String discussSubject;
 
     /**
      * 类型 1 图文 2 投票
@@ -62,10 +63,12 @@
     /**
      * 1 单选 2 多选
      */
-    private Integer option;
+    private Integer discussOption;
 
     /**
      * 投票标题
      */
     private String voteTitle;
+
+
 }

--
Gitblit v1.7.1