Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 02b5015e989fef8878744d50f21a092efa395231

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java

@@ -23,7 +23,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
@@ -111,10 +111,22 @@
     */
    private Long villageId;

    /**
     * 街道id
     * @return
     */
    private Long streetId;

    /**
     * 层次递归字段（省>市>区县>街道>社区>小区>详细地址）
     */
    private String path;

    @Override
    public String toString() {
        return "ComMngPopulationHouseDO{" +
                "id=" + id +
                ", streetId="+streetId+
                ", address=" + address +
                ", code=" + code +
                ", alley=" + alley +
@@ -125,6 +137,7 @@
                ", isEmpty=" + isEmpty +
                ", constructPurpose=" + constructPurpose +
                ", constructArea=" + constructArea +
                ", path="+path+
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";