From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java |    9 +++++++++
 1 files changed, 9 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 a96a0ef..5807d1c 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;
+
 	/**
 	 * 小区名称
 	 */
@@ -168,6 +174,9 @@
 	 */
 	private Integer limit;
 
+	@ApiModelProperty(value = "未成年", example = "")
+	private Integer minors;
+
 	/**
 	 * 角色名称
 	 */

--
Gitblit v1.9.3