From 958ddfcec71043b6b800feaac521e7b22bb15e97 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index 3bf6a51..95eda8f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -38,6 +38,7 @@
import org.springblade.system.user.entity.User;
import org.springblade.system.user.enums.UserEnum;
import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.vo.TenantVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +67,7 @@
private final IUserClient userClient;
@Override
- public IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant) {
+ public IPage<TenantVo> selectTenantPage(IPage<TenantVo> page, Tenant tenant) {
return page.setRecords(baseMapper.selectTenantPage(page, tenant));
}
@@ -254,8 +255,8 @@
}
@Override
- public List<Map<String, Object>> selectList(String type) {
- return baseMapper.selectList(type);
+ public List<Map<String, Object>> selectListTe(String type) {
+ return baseMapper.selectListTe(type);
}
private String getTenantId(List<String> codes) {
--
Gitblit v1.9.3