From 5e966ab720ffff2bd0fe55ffda7263606923732d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 02 二月 2023 10:58:03 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 47c9f4c..c19181d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -41,12 +41,12 @@
     }
 
     @Override
-    public List<LocMast> queryFreeLocMastEnd(Integer row){
-        return this.baseMapper.queryFreeLocMastEnd(row);
+    public List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1){
+        return this.baseMapper.queryFreeLocMastEnd(row, locType1);
     }
     @Override
-    public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row){
-        return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row);
+    public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1){
+        return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row, locType1);
     }
 
     @Override

--
Gitblit v1.9.1