From ae38b2b65b709ac576eec2b507c92008a7afc3de Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Apr 2021 09:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
index bc04aeb..ed3acbe 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.TenantVo;
 
 import java.util.Date;
 import java.util.List;
@@ -38,7 +39,7 @@
 	 * @param tenant
 	 * @return
 	 */
-	IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant);
+	IPage<TenantVo> selectTenantPage(IPage<TenantVo> page, Tenant tenant);
 
 	/**
 	 * 根据租户编号获取实体
@@ -85,4 +86,5 @@
 	void deletey(String hn);
 	void deletes(String hn);
 	void deleter(String hn);
+	List<Map<String, Object>> selectListTe(String type);
 }

--
Gitblit v1.9.3