Merge branch 'test' into 'master'

罗元桥

2021-07-24 cbf825f4e63e77241a11ec90841637991e43940f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java

@@ -17,6 +17,16 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long houseId;

    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populId;

    @ApiModelProperty("人和房屋关系")
    private Integer relationId;

    @ApiModelProperty("与户主关系")
    private Integer relation;

    @ApiModelProperty("房屋地址")
    private String address;