From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
index 9cd4d97..22fbef9 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -24,6 +24,7 @@
 import org.springblade.modules.taskqd.entity.Taskqd;
 import org.springblade.modules.taskqd.mapper.TaskqdMapper;
 import org.springblade.modules.taskqd.service.ITaskqdService;
+import org.springblade.modules.taskqd.vo.TaskqdVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -49,7 +50,7 @@
 	}
 
 	@Override
-	public List<Taskqd> selectLi(String type, String serid) {
+	public List<TaskqdVO> selectLi(String type, String serid) {
 		return baseMapper.selectLi(type, serid);
 	}
 }

--
Gitblit v1.9.3