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

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

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -115,6 +113,7 @@

    /**
     * 街道id
     * 
     * @return
     */
    private Long streetId;
@@ -126,22 +125,10 @@

    @Override
    public String toString() {
        return "ComMngPopulationHouseDO{" +
                "id=" + id +
                ", streetId="+streetId+
                ", address=" + address +
                ", code=" + code +
                ", alley=" + alley +
                ", houseNum=" + houseNum +
                ", status=" + status +
                ", purpose=" + purpose +
                ", controlStatus=" + controlStatus +
                ", isEmpty=" + isEmpty +
                ", constructPurpose=" + constructPurpose +
                ", constructArea=" + constructArea +
                ", path="+path+
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
        return "ComMngPopulationHouseDO{" + "id=" + id + ", streetId=" + streetId + ", address=" + address + ", code="
            + code + ", alley=" + alley + ", houseNum=" + houseNum + ", status=" + status + ", purpose=" + purpose
            + ", controlStatus=" + controlStatus + ", isEmpty=" + isEmpty + ", constructPurpose=" + constructPurpose
            + ", constructArea=" + constructArea + ", path=" + path + ", createAt=" + createAt + ", updateAt="
            + updateAt + "}";
    }
}