From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
index 811525c..73edc2c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
@@ -22,7 +22,17 @@
}
@Override
- public List<WrkMastSta> selectBywrkNoHistoricalTasks(Integer rgvNo, Integer taskNo1, Integer taskNo2) {
- return this.baseMapper.selectBywrkNoHistoricalTasks(rgvNo,taskNo1,taskNo2);
+ public List<WrkMastSta> selectBywrkNoHistoricalTasks(Integer rgvNo, Integer taskNo1) {
+ return this.baseMapper.selectBywrkNoHistoricalTasks(rgvNo,taskNo1);
+ }
+
+ @Override
+ public List<WrkMastSta> selectBywrkNoHistoricalTasks2(Integer rgvNo, Integer taskNo2) {
+ return this.baseMapper.selectBywrkNoHistoricalTasks2(rgvNo, taskNo2);
+
+ }
+ @Override
+ public List<WrkMastSta> selectRGVTask1(Integer id) {
+ return this.baseMapper.selectRGVTask1(id);
}
}
--
Gitblit v1.9.1