From fb798e4982a392408b3e8324c69baba0824fe3fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 13:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
index 527f2e4..cc28812 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
@@ -19,7 +19,11 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
 import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
+import org.springblade.modules.house.vo.HouseParam;
+
+import java.util.List;
 
 /**
  * 门牌地址表（总台账数据） 服务类
@@ -48,12 +52,10 @@
 
 	/**
 	 * 获取楼盘相关集合数据
-	 * @param name 名称
-	 * @param code 编号
-	 * @param type 类型 1：社区  2：小区  3：楼栋  4：户室
+	 * @param houseParam
 	 * @return
 	 */
-    Object getHousesList(String name, String code, Integer type);
+    Object getHousesList(HouseParam houseParam);
 
 	/**
 	 * 查询房屋及出租详情信息
@@ -61,4 +63,8 @@
 	 * @return
 	 */
 	Object getHouseRentInfo(String code);
+
+	List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type);
+
+	DoorplateAddressVO getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO);
 }

--
Gitblit v1.9.3