合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

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