From 7ba995f514c6d20a59cc69afa05110110e9b2de5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 十月 2023 08:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into skwcs
---
src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
index fdc699b..987a0bc 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
@@ -10,7 +10,9 @@
@Repository
public interface WrkChargeMapper extends BaseMapper<WrkCharge> {
- WrkCharge selectWorkingOfCharge(@Param("shuttleNo") Integer shuttleNo, @Param("charge") Integer charge);
+ WrkCharge selectWorking(@Param("shuttleNo") Integer shuttleNo);
+
+ WrkCharge selectWorkingOfCharge(@Param("charge") Integer charge);
WrkCharge selectWorkingOfReset(@Param("steNo") Integer steNo);
--
Gitblit v1.9.1