From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
index 8799c1b..55f5712 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
@@ -1,11 +1,13 @@
 package com.panzhihua.common.model.vos.community;
 
+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;
-
-import java.util.Date;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -44,11 +46,26 @@
     @ApiModelProperty("评论人名字")
     private String userName;
 
+    @ApiModelProperty("评论人昵称")
+    private String userNickName;
+
+    @ApiModelProperty("回复人名字")
+    private String userNameBack;
+
+    @ApiModelProperty("回复人昵称")
+    private String userNickNameBack;
+
     @ApiModelProperty("评论人手机号")
     private String phone;
 
+    @ApiModelProperty("评论人头像")
+    private String imageUrl;
+
     @ApiModelProperty("点赞数量")
     private Integer num;
+
+    @ApiModelProperty("是否点赞 1 是 0 否")
+    private Integer haveSign = 0;
 
     @ApiModelProperty("回复内容")
     private String commentBack;
@@ -56,4 +73,14 @@
     @ApiModelProperty("回复时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date timeBack;
+
+    @ApiModelProperty("二级评论集合")
+    private List<ComActDiscussCommentVO> comActDiscussCommentVOList;
+
+    @ApiModelProperty("评论人用户类型(1.小程序用户(其他均为后台用户))")
+    private Integer userType;
+
+    @ApiModelProperty("回复量")
+    private Integer replyNum;
+
 }

--
Gitblit v1.7.1