Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

Junjie

2023-10-31 e6ed9e8a9f24683e8ea4e9fc2c82b1d4e24bb00a

 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java

@@ -100,7 +100,7 @@
                    .eq("station_code", stationCode)
                    .like("dev_no", "0" + i + "@");

            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "307".equals(stationCode)){
            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "CS-307".equals(stationCode)){
                wrapper.orderBy("dev_no",false);
            }