From 8498553a007f331534d454711eacea0086b6fdbf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 Nov 2023 15:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseService.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseService.java b/src/main/java/org/springblade/modules/house/service/IHouseService.java
index 7232e68..8eecfaa 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseService.java
@@ -18,11 +18,11 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.vo.HouseParam;
+import org.springblade.modules.house.vo.HouseTree;
 import org.springblade.modules.house.vo.HouseVO;
-import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.system.excel.HouseExcel;
-import org.springblade.modules.system.excel.HouseHoldExcel;
+import org.springblade.modules.house.excel.HouseExcel;
 
 import java.util.List;
 
@@ -60,4 +60,11 @@
     void importUserHouse(List<HouseExcel> data, Boolean isCovered);
 
 	List<HouseExcel> export(HouseVO household);
+
+	/**
+	 * 查询房屋树
+	 * @param houseParam
+	 * @return
+	 */
+    List<HouseTree> getHouseTree(HouseParam houseParam);
 }

--
Gitblit v1.9.3