tuqiang 78a4a4d6bd Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
#	acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
#	acs/nladmin-ui/src/views/acs/device/config.vue

2023-11-07 13:39:36 +08:00

..

acs

Merge remote-tracking branch 'origin/master'

2023-11-07 13:39:36 +08:00

common/utils

更新日志

2023-02-06 15:05:27 +08:00

config

rev:操作日志问题修改

2023-09-08 10:39:57 +08:00

modules

rev 行架任务校验

2023-10-26 17:17:13 +08:00

start

init

2022-10-27 18:58:02 +08:00

AppRun.java

fix 反馈任务状态接口超时重发、烘箱和输送线都优化了逻辑

2023-07-24 17:18:05 +08:00