From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
index b725119..7112d03 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -1,14 +1,10 @@
package com.yuanchu.limslaboratory.mapper;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
-
-import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface PlanMapper {
- /**
- * 鏌ヨ妫�楠岃鍒�
- * @return
- */
- List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
+
+ //鏌ヨ妫�楠岃鍒�
+ List<Map<String, Object>> selectAllPlan(String code, String beginTime, String endTime,Integer status);
}
--
Gitblit v1.9.3