From 74803a8987f942f94f703fbbf57a4e7d8d7ea44a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:36 +0800
Subject: [PATCH] Merge branch 'yuyue_dev' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 8e6c19a..8005ad7 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
@@ -1,13 +1,13 @@
package com.panzhihua.common.model.vos.community;
-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;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,13 +61,19 @@
@ApiModelProperty("发布人名字")
private String userName;
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
@ApiModelProperty("发布人头像")
private String imageUrl;
@ApiModelProperty("是否已经点赞 1 是 0 否")
- private Integer haveSign;
+ private Integer haveSign = 0;
@ApiModelProperty("是否已经投票 1 是 0 否")
- private Integer haveVote;
+ private Integer haveVote = 0;
+
+ @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
+ private Integer userType;
}
--
Gitblit v1.7.1