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/ComSwPatrolRecordDO.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
@@ -105,7 +105,6 @@
    */
    private Integer isHiddenDanger;


    /**
    * 创建时间
    */
@@ -130,25 +129,11 @@

    @Override
    public String toString() {
        return "ComSwPatrolRecordDO{" +
                "id=" + id +
                ", patrolTime=" + patrolTime +
                ", patrolType=" + patrolType +
                ", patrolLeader=" + patrolLeader +
                ", patrolPerson=" + patrolPerson +
                ", address=" + address +
                ", recordContent=" + recordContent +
                ", findRecord=" + findRecord +
                ", recordPhoto=" + recordPhoto +
                ", remark=" + remark +
                ", successionLeader=" + successionLeader +
                ", successionPerson=" + successionPerson +
                ", successionTime=" + successionTime +
                ", isHiddenDanger=" + isHiddenDanger +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
                "}";
        return "ComSwPatrolRecordDO{" + "id=" + id + ", patrolTime=" + patrolTime + ", patrolType=" + patrolType
            + ", patrolLeader=" + patrolLeader + ", patrolPerson=" + patrolPerson + ", address=" + address
            + ", recordContent=" + recordContent + ", findRecord=" + findRecord + ", recordPhoto=" + recordPhoto
            + ", remark=" + remark + ", successionLeader=" + successionLeader + ", successionPerson=" + successionPerson
            + ", successionTime=" + successionTime + ", isHiddenDanger=" + isHiddenDanger + ", createAt=" + createAt
            + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy=" + updateBy + "}";
        }
}