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/service/impl/PlanServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index df39e9c..5819ccd 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -29,9 +29,9 @@
* @return
*/
@Override
- public List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId) {
+ public List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user) {
//鑾峰彇鏁版嵁搴撴暟鎹�
- List<PlanVo> planVos = planMapper.selectAllPlan(deviceId, beginTime, endTime, userId);
+ List<PlanVo> planVos = planMapper.selectAllPlan(device, beginTime, endTime, user);
//娣诲姞璁″垝宸ユ湡鍜屾楠岃繘搴�
planVos.forEach(planVo -> {
//娣诲姞妫�楠岃繘搴�
--
Gitblit v1.9.3