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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java

@@ -38,7 +38,7 @@
    /**
     * 上级回复id
     */
    private Long panentId;
    private Long parentId;

    /**
     * 上级回复用户id
@@ -71,13 +71,18 @@
     */
    private Integer isRelease;

    /**
     * 状态（1.显示 2.隐藏）
     */
    private Integer status;

    @Override
    public String toString() {
        return "ComActNeighborCircleCommentReplyDO{" +
                "id=" + id +
                ", circleId=" + circleId +
                ", commentId=" + commentId +
                ", panentId=" + panentId +
                ", parentId=" + parentId +
                ", parentUserId=" + parentUserId +
                ", userId=" + userId +
                ", replyContent=" + replyContent +