From d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 14 十二月 2021 16:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
index 0607ce3..a9ce1c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
@@ -72,4 +72,9 @@
     @ApiModelProperty(value = "纬度")
     private String lat;
 
+    @ApiModelProperty(value = "政治面貌文字描述")
+    private String outlook;
+
+    @ApiModelProperty(value = "人和房屋关系(1.业主 2.业主家属 3.租户)")
+    private Integer relationId;
 }

--
Gitblit v1.7.1