From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug

---
 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 dc2824a..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));
 	}
 

--
Gitblit v1.9.3