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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java

@@ -26,7 +26,10 @@
    private String parentUserName;

    @ApiModelProperty("回复用户名称")
    private Long userName;
    private String userName;

    @ApiModelProperty("回复用户头像url")
    private String userHeadUrl;

    @ApiModelProperty("回复内容")
    private String replyContent;
@@ -41,4 +44,10 @@
    @ApiModelProperty("是否是作者回复（1.是 2.否）")
    private Integer isRelease;

    /**
     * 是否已经点赞 1 是 2 否
     */
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;

}