From a81c56cc9d0766914a5cd932cb61bf94dce27bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 13:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs
---
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
index f0f36ec..0121d3e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -15,5 +15,8 @@
WrkMastSta selectByRgvNoandWrkNo2(Integer rgvNo, Integer taskNo2);
- List<WrkMastSta> selectBywrkNoHistoricalTasks(Integer rgvNo, Integer taskNo1, Integer taskNo2);
+ List<WrkMastSta> selectBywrkNoHistoricalTasks(Integer rgvNo, Integer taskNo1);
+ List<WrkMastSta> selectBywrkNoHistoricalTasks2(Integer rgvNo, Integer taskNo2);
+
+ List<WrkMastSta> selectRGVTask1(Integer id);
}
--
Gitblit v1.9.1