From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java |   22 ++++++++++++++++++++++
 1 files changed, 22 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 918d8c4..789c908 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -40,6 +40,12 @@
 	 */
 	private String roleRelationName;
 
+	@ApiModelProperty(value = "标签")
+	private List<Integer> labelIdList;
+
+	@ApiModelProperty(value = "标签类型：重点人员，关注人员")
+	private Integer labelType;
+
 	/**
 	 * 小区名称
 	 */
@@ -143,10 +149,15 @@
 
 	private String aoiCode;
 
+	private String neiCode;
+
 	/**
 	 * 标签id
 	 */
 	private Integer labelId;
+
+	//	标签父级id
+	private Integer parentId;
 
 	/**
 	 * 标签名称
@@ -163,9 +174,20 @@
 	 */
 	private Integer limit;
 
+	@ApiModelProperty(value = "未成年 1：否 2：是", example = "")
+	private Integer minors;
+
 	/**
 	 * 角色名称
 	 */
+//	private String roleName;
+
+	// 角色名称
+	@ApiModelProperty(value = "角色名称", example = "")
 	private String roleName;
 
+	// 社区编号
+	@ApiModelProperty(value = "社区编号", example = "")
+	private String communityCode;
+
 }

--
Gitblit v1.9.3