From 2bd0f5e053cfe4dd90d6a5123474c9b41bcee94e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 11 十一月 2023 17:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
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