|
|
42e572a003
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
|
2024-02-26 16:33:08 +08:00 |
|
|
|
2f85b23948
|
fix :lms联调
|
2024-02-26 16:31:33 +08:00 |
|
yanps
|
7282a6ef66
|
opt: 设备优化
|
2024-02-23 16:37:01 +08:00 |
|
|
|
7c97cb116e
|
add :设备国际化
|
2024-02-20 17:16:58 +08:00 |
|
yanps
|
47b3889c5b
|
add: 添加仙工AGV,流量限制界面;实现流量限制国际化
|
2024-01-22 19:31:00 +08:00 |
|
USER-20220102CG\noblelift
|
3da40b153d
|
init 二期ACS
|
2024-01-16 16:31:20 +08:00 |
|
