Merge branch 'txb'

tangxiaobao

2021-08-18 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c

 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;