From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 e242023..d1c6adc 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
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import java.util.Date;
@@ -21,7 +22,7 @@
private Long id;
@ApiModelProperty("主题")
- private String subject;
+ private String discussSubject;
@ApiModelProperty("类型 1 图文 2 投票")
private Integer type;
@@ -43,7 +44,7 @@
private Date createAt;
@ApiModelProperty("1 单选 2 多选")
- private Integer option;
+ private Integer discussOption;
@ApiModelProperty("投票标题")
private String voteTitle;
@@ -60,4 +61,19 @@
@ApiModelProperty("发布人名字")
private String userName;
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("是否已经点赞 1 是 0 否")
+ private Integer haveSign;
+
+ @ApiModelProperty("是否已经投票 1 是 0 否")
+ private Integer haveVote;
+
+ @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
+ private Integer userType;
+
}
--
Gitblit v1.7.1