From 3a5ea5a84c338e0cb7a942e03a98e883a0b23115 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 07 Feb 2024 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java |    8 ++++++++
 1 files changed, 8 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 7521028..fdc862b 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -148,6 +148,9 @@
 	 */
 	private Integer labelId;
 
+	//	标签父级id
+	private Integer parentId;
+
 	/**
 	 * 标签名称
 	 */
@@ -163,4 +166,9 @@
 	 */
 	private Integer limit;
 
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
+
 }

--
Gitblit v1.9.3