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/ComActNeighborCircleFabulousDO.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
@@ -62,6 +62,13 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    @Override
    public String toString() {
        return "ComActNeighborCircleFabulousDO{" + "id=" + id + ", type=" + type + ", parentId=" + parentId
            + ", userId=" + userId + ", isEffective=" + isEffective + ", createAt=" + createAt + ", updateAt="
            + updateAt + "}";
    }

    /**
     * 有效状态（1.有效  2.取消）
     */
@@ -77,18 +84,5 @@
        int llq = 1;
        int pl = 2;
        int hf = 3;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleFabulousDO{" +
                "id=" + id +
                ", type=" + type +
                ", parentId=" + parentId +
                ", userId=" + userId +
                ", isEffective=" + isEffective +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}