From c9c4976f4e1e553edc98e4171a1d1741bde542f5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 14:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 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..b725119 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
@@ -10,5 +10,5 @@
* 鏌ヨ妫�楠岃鍒�
* @return
*/
- List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+ List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
}
--
Gitblit v1.9.3