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

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

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

@@ -63,6 +63,12 @@
    private Date createAt;

    /**
     * 更改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
    public interface relation{
@@ -89,6 +95,7 @@
                ", populId=" + populId +
                ", houseId=" + houseId +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}