From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 0a711c9..199b8b1 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -65,6 +65,11 @@
private String gridName;
/**
+ * 区域编号
+ */
+ private String regionCode;
+
+ /**
* 标签
*/
private List<HouseholdLabelVO> householdLabelList = new ArrayList<>();
@@ -75,4 +80,62 @@
@ApiModelProperty("结束时间")
private String endTime;
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ /**
+ * 来源
+ */
+ private Integer source;
+
+ /**
+ * 户籍地行政区划区县名称
+ */
+ private String residentAdName;
+
+ /**
+ * 户籍地行政区划省名称
+ */
+ private String residentProvinceAdName;
+
+ /**
+ * 户籍地行政区划省编号
+ */
+ private String residentProvinceAdCode;
+
+ /**
+ * 户籍地行政区划市名称
+ */
+ private String residentCityAdName;
+
+ /**
+ * 户籍地行政区划市编号
+ */
+ private String residentCityAdCode;
+
+ /**
+ * 籍贯地行政区划区县名称
+ */
+ private String nativePlaceAdName;
+
+ /**
+ * 籍贯地行政区划省名称
+ */
+ private String nativePlaceProvinceAdName;
+
+ /**
+ * 籍贯地行政区划省编号
+ */
+ private String nativePlaceProvinceAdCode;
+
+ /**
+ * 籍贯地行政区划市名称
+ */
+ private String nativePlaceCityAdName;
+
+ /**
+ * 籍贯地行政区划市编号
+ */
+ private String nativePlaceCityAdCode;
+
}
--
Gitblit v1.9.3