From b6169fae531465dc60f3b5c8f841eb2dd7009eec Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 四月 2021 14:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
index aaf127c..ba4d731 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
@@ -21,13 +21,16 @@
     private Long circleId;
 
     @ApiModelProperty("评论用户")
-    private Long userName;
+    private String userName;
+
+    @ApiModelProperty("用户昵称")
+    private String userNickName;
 
     @ApiModelProperty("评论用户手机号")
     private String userPhone;
 
-    @ApiModelProperty("评论内容")
-    private String content;
+    @ApiModelProperty("内容")
+    private String replyContent;
 
     @ApiModelProperty("点赞数")
     private Integer fabulousNum;

--
Gitblit v1.7.1