From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +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 356a29d..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(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+
+    //鏌ヨ妫�楠岃鍒�
+    List<Map<String, Object>> selectAllPlan(String code, String beginTime, String endTime,Integer status);
 }

--
Gitblit v1.9.3