From 0814274c6ef53f39d9460e4d029717c9eff999e0 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 20 May 2024 09:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseTenantService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseTenantService.java b/src/main/java/org/springblade/modules/house/service/IHouseTenantService.java
index af3311a..6afdbdb 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseTenantService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseTenantService.java
@@ -18,9 +18,13 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.house.entity.HouseTenantEntity;
+import org.springblade.modules.house.excel.ExportHouseTenantExcel;
+import org.springblade.modules.house.excel.HouseTenantExcel;
 import org.springblade.modules.house.vo.HouseTenantVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
 
 /**
  * 租户管理 服务类
@@ -45,4 +49,12 @@
 	 * @return
 	 */
     int removeByHousingRentalId(Long id);
+
+	/**
+	 * 导出租客
+	 * @return
+	 */
+    List<ExportHouseTenantExcel> export();
+
+	String importUserTenant(List<HouseTenantExcel> read, boolean b);
 }

--
Gitblit v1.9.3