From c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:21:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
index 63eb8f3..b8334d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
@@ -16,15 +16,18 @@
@ApiModelProperty("实有房屋id")
private Long id;
- @ApiModelProperty(value = "是否是居住地(1.是 2.否)")
+ @ApiModelProperty(value = "是否是居住地(1.是 0.否)")
private Integer isResidence;
+ @ApiModelProperty("与户主关系")
+ private Integer relation;
+
/**
- * 是否是居住地(1.是 2.否)
+ * 是否是居住地(1.是 0.否)
*/
public interface isResidence{
int yes = 1;
- int no = 2;
+ int no = 0;
}
}
--
Gitblit v1.7.1