Commit Graph

11 Commits

Author SHA1 Message Date
41fea50b24 Merge remote-tracking branch 'origin/master' 2024-06-15 15:10:09 +08:00
01a0ebfb4e add: 诺宝agv、诺宝叉车调试开发 2024-06-15 15:09:22 +08:00
wangsong
5f6e0f61b5 add 2024-06-13 14:29:00 +08:00
2fa7a54247 add: 行架缓存为页面 2024-03-18 10:59:44 +08:00
9f25ba7b59 add:新增行架-agv对接位驱动 2024-02-02 15:17:31 +08:00
bf368ec156 fix : 申请任务先找指令 2024-02-01 16:37:50 +08:00
USER-20220102CG\noblelift
5b99185f24 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-16 21:08:50 +08:00
USER-20220102CG\noblelift
a1e888ffe4 rev 2024-01-16 21:08:32 +08:00
ludj
af43ab7830 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java
#	acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
2024-01-16 20:36:48 +08:00
ludj
d2476700fa rev: 去掉swagger 2024-01-16 20:17:22 +08:00
USER-20220102CG\noblelift
3da40b153d init 二期ACS 2024-01-16 16:31:20 +08:00