From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
index 2fac36c..eee3815 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.TenantVo;
 
 import java.util.List;
 import java.util.Map;
@@ -37,8 +38,8 @@
 	 * @param tenant
 	 * @return
 	 */
-	List<Tenant> selectTenantPage(IPage page, Tenant tenant);
-	List<Map<String, Object>> selectList(String type);
+	List<TenantVo> selectTenantPage(IPage page, Tenant tenant);
+	List<Map<String, Object>> selectListTe(String type);
 	int inserts(String dj, String had, String ht, String ctime,String content,String hn);
 	void updateInfoy(String dj, String had, String ht, String ctime,String content,String hn);
 	List<Map<String, Object>> selectTy(String hn);

--
Gitblit v1.9.3