From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index 399593a..dab9548 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -26,6 +26,7 @@
List<String> selectCacheShelvesStationCodeByFloor(int floor);
List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor);
+ List<String> selectCacheShelvesStationCodeByLocType2(short locType, int floor);
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode);
--
Gitblit v1.9.1