合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 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);