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/mapper/TaskqdMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
index 2a84f0e..9ca0151 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -22,6 +22,7 @@
 import org.springblade.modules.task.entity.Task;
 import org.springblade.modules.task.vo.TaskVO;
 import org.springblade.modules.taskqd.entity.Taskqd;
+import org.springblade.modules.taskqd.vo.TaskqdVO;
 
 import java.util.List;
 
@@ -35,5 +36,5 @@
 	//抢单任务
 	void updatet(Integer id, Integer num, String serid);
 	List<Taskqd> selectList(Integer id);
-	List<Taskqd> selectLi(String type,String serid);
+	List<TaskqdVO> selectLi(String type, String serid);
 }

--
Gitblit v1.9.3