From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 b062df2..0339f91 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
@@ -21,19 +21,28 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long populId;
- @ApiModelProperty("人和房屋关系")
+ @ApiModelProperty("人和房屋关系’ (1.自住2、租住)(取字典表国家标准编码)")
private Integer relationId;
- @ApiModelProperty("与户主关系")
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)(取字典表国家标准编码)")
private Integer relation;
@ApiModelProperty("房屋地址")
private String address;
- @ApiModelProperty("房屋状态")
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)(取字典表国家标准编码)")
private Integer status;
@ApiModelProperty("是否居住地 1.是 0.否")
private Integer residence;
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)(取字典表国家标准编码)")
+ private Integer purpose;
+
+ @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)(取字典表国家标准编码)")
+ private Integer controlStatus;
+
+ @ApiModelProperty("关系主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
}
--
Gitblit v1.7.1