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/HouseholdLabelVO.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
index 98695b9..001f2e3 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
@@ -20,6 +20,8 @@
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.house.entity.UserHouseLabelEntity;
 
+import java.util.List;
+
 /**
  * 住户-标签 视图实体类
  *
@@ -35,9 +37,24 @@
 	private String communityName;
 
 	private String regionName;
+	private String regionCode;
 
 	private String communityCode;
 
-	private Integer numbers;
+	//	刑释解教人员
+//	肇事肇祸精神障碍患者
+//	一般精神障碍患者
+//	重点对象
+//	取保候审
+	private Integer number1;
+	private Integer number2;
+	private Integer number3;
+	private Integer number4;
+	private Integer number5;
+	private Integer number6;
+	private Integer number7;
+	private Integer number8;
+
+	private List<Integer> ListId;
 
 }

--
Gitblit v1.9.3