Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

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

@@ -1,7 +1,9 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,7 +14,18 @@
public class ComMngHouseVo {

    @ApiModelProperty("房屋id")
    @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;
@@ -20,4 +33,7 @@
    @ApiModelProperty("房屋状态")
    private Integer status;

    @ApiModelProperty("是否居住地 1.是 0.否")
    private Integer residence;

}