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/HouseholdLabelVO.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 bf7eb97..88d3913 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
@@ -16,10 +16,11 @@
*/
package org.springblade.modules.house.vo;
-import org.springblade.modules.house.entity.HouseholdLabelEntity;
-import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
+
+import java.util.List;
/**
* 住户-标签 视图实体类
@@ -29,7 +30,28 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class HouseholdLabelVO extends HouseholdLabelEntity {
+public class HouseholdLabelVO extends UserHouseLabelEntity {
private static final long serialVersionUID = 1L;
+
+ private String communityName;
+
+ private String regionName;
+ private String regionCode;
+
+ private String communityCode;
+
+ // 刑释解教人员
+// 肇事肇祸精神障碍患者
+// 一般精神障碍患者
+// 重点对象
+// 取保候审
+ private Integer number1;
+ private Integer number2;
+ private Integer number3;
+ private Integer number4;
+ private Integer number5;
+
+ private List<Integer> ListId;
+
}
--
Gitblit v1.9.3