Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

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

@@ -123,6 +123,10 @@
    /**
     * 民族
     */
    private String nationCode;
    /**
     * 民族
     */
    private String nation;
    /**
     * 是否租住(0.否 1.是)
@@ -170,7 +174,7 @@
    /**
     * 居住地房屋id
     */
//    private Long houseId;
    private Long houseId;

    /**
     * 性别（1.男 2.女 3.未知）