From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 100 insertions(+), 2 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 043e700..a96a0ef 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -17,10 +17,9 @@
package org.springblade.modules.house.vo;
import io.swagger.annotations.ApiModelProperty;
-import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.house.entity.HouseholdEntity;
import java.util.ArrayList;
import java.util.List;
@@ -83,4 +82,103 @@
@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;
+
+ private String building;
+
+ private String unit;
+
+ private String aoiCode;
+
+ private String neiCode;
+
+ /**
+ * 标签id
+ */
+ private Integer labelId;
+
+ // 标签父级id
+ private Integer parentId;
+
+ /**
+ * 标签名称
+ */
+ private String labelName;
+
+ /**
+ * 查询key
+ */
+ private String searchKey;
+
+ /**
+ * 取值数
+ */
+ private Integer limit;
+
+ /**
+ * 角色名称
+ */
+// private String roleName;
+
+ // 角色名称
+ @ApiModelProperty(value = "角色名称", example = "")
+ private String roleName;
+
+ // 社区编号
+ @ApiModelProperty(value = "社区编号", example = "")
+ private String communityCode;
+
}
--
Gitblit v1.9.3