From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
index fbb988c..b062df2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
+++ b/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;
+
}
--
Gitblit v1.7.1