Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-05-11 6d90aa0d86d4ef7d1eb4eda5dab1c10dc9e9df26

 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;