From 538b74a65dffadbd143a9e7e4218e0d0d91100fa Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 e348b2e..912d7ba 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,12 +1,15 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,9 +21,11 @@
@ApiModel("一起议评论详情")
public class ComActDiscussCommentVO {
@ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("一起议主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussId;
@ApiModelProperty("评论内容")
@@ -37,6 +42,7 @@
private Integer isAuthor;
@ApiModelProperty("上级评论id 默认0表示一级评论")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@ApiModelProperty("用户主键")
@@ -54,7 +60,6 @@
@ApiModelProperty("回复人昵称")
private String userNickNameBack;
-
@ApiModelProperty("评论人手机号")
private String phone;
@@ -65,7 +70,7 @@
private Integer num;
@ApiModelProperty("是否点赞 1 是 0 否")
- private Integer haveSign;
+ private Integer haveSign = 0;
@ApiModelProperty("回复内容")
private String commentBack;
@@ -77,4 +82,10 @@
@ApiModelProperty("二级评论集合")
private List<ComActDiscussCommentVO> comActDiscussCommentVOList;
+ @ApiModelProperty("评论人用户类型(1.小程序用户(其他均为后台用户))")
+ private Integer userType;
+
+ @ApiModelProperty("回复量")
+ private Integer replyNum;
+
}
--
Gitblit v1.7.1