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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java

@@ -74,4 +74,7 @@

    @ApiModelProperty(value = "政治面貌文字描述")
    private String outlook;

    @ApiModelProperty(value = "人和房屋关系（1.业主 2.业主家属 3.租户）")
    private Integer relationId;
}