From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 163de40..bcd53d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -29,8 +29,13 @@
}
@Override
- public LocMast queryFreeLocMast2(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast2(row, locType1);
+ public LocMast queryFreeLocMast2(Integer row, Short locType1, Short locType2) {
+ return this.baseMapper.queryFreeLocMast2(row, locType1 ,locType2);
+ }
+
+ @Override
+ public Integer queryFreeLocMastCount(Integer row, Short locType1, Short locType2) {
+ return this.baseMapper.queryFreeLocMastCount(row, locType1 ,locType2);
}
--
Gitblit v1.9.1