|
|
89b2fff3d1
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/bas/srgvmap/service/impl/RoadCacheServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java
# ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
# ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/mapper/WcsSrgvQueueMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/cdz/PlcCdzRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/srgv/PlcSrgvRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
# ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
# ruoyi-admin/src/main/resources/mapper/queue/WcsSrgvQueueMapper.xml
|
2026-07-24 08:52:43 +08:00 |
|
