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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -66,26 +66,18 @@
     */
    private Integer isRelease;

    @Override
    public String toString() {
        return "ComActNeighborCircleCommentDO{" + "id=" + id + ", circleId=" + circleId + ", userId=" + userId
            + ", content=" + content + ", userPhone=" + userPhone + ", fabulousNum=" + fabulousNum + ", status="
            + status + ", createAt=" + createAt + ", isRelease=" + isRelease + "}";
    }

    /**
     * 是否是作者评论（1.是 2.否）
     */
    public interface isRelease{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleCommentDO{" +
                "id=" + id +
                ", circleId=" + circleId +
                ", userId=" + userId +
                ", content=" + content +
                ", userPhone=" + userPhone +
                ", fabulousNum=" + fabulousNum +
                ", status=" + status +
                ", createAt=" + createAt +
                ", isRelease=" + isRelease +
                "}";
    }
}