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/ComSwDangerReportDO.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 txb
@@ -22,7 +22,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    @TableId(value = "id",type = IdType.INPUT)
    private Long id;

    /**
@@ -154,29 +154,13 @@

@Override
public String toString() {
        return "ComSwDangerReportDO{" +
                "id=" + id +
                ", dangerNo=" + dangerNo +
                ", dangerName=" + dangerName +
                ", dangerType=" + dangerType +
                ", status=" + status +
                ", dangerLevel=" + dangerLevel +
                ", checkTime=" + checkTime +
                ", unitName=" + unitName +
                ", dagerDescription=" + dagerDescription +
                ", isRectifyImmediately=" + isRectifyImmediately +
                ", takeSteps=" + takeSteps +
                ", stepsPhoto=" + stepsPhoto +
                ", rectifyPerson=" + rectifyPerson +
                ", rectifyTime=" + rectifyTime +
                ", communitySuggestion=" + communitySuggestion +
                ", streetSuggestion=" + streetSuggestion +
                ", undertakeRecord=" + undertakeRecord +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComSwDangerReportDO{" + "id=" + id + ", dangerNo=" + dangerNo + ", dangerName=" + dangerName
            + ", dangerType=" + dangerType + ", status=" + status + ", dangerLevel=" + dangerLevel + ", checkTime="
            + checkTime + ", unitName=" + unitName + ", dagerDescription=" + dagerDescription
            + ", isRectifyImmediately=" + isRectifyImmediately + ", takeSteps=" + takeSteps + ", stepsPhoto="
            + stepsPhoto + ", rectifyPerson=" + rectifyPerson + ", rectifyTime=" + rectifyTime
            + ", communitySuggestion=" + communitySuggestion + ", streetSuggestion=" + streetSuggestion
            + ", undertakeRecord=" + undertakeRecord + ", remark=" + remark + ", createAt=" + createAt + ", createBy="
            + createBy + ", updateAt=" + updateAt + ", updateBy=" + updateBy + "}";
        }
        }