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/ComActNeighborCircleTopicDO.java

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * @auther lyq
@@ -38,7 +38,7 @@
    private String name;

    /**
     * 状态（1.启用  2.禁用）
     * 状态（1.启用 2.禁用）
     */
    private Integer status;

@@ -72,12 +72,7 @@

    @Override
    public String toString() {
        return "ComActNeighborCircleTopicDO{" +
                "id=" + id +
                ", name=" + name +
                ", status=" + status +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                "}";
        return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="
            + createAt + ", createBy=" + createBy + "}";
    }
}