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

tangxiaobao

2021-07-27 9c8735c70d86a31081340ca78bb2b538ed11a6e5

 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;