解决README的合并冲突

更新：README
2026-02-01 11:39:01 +08:00 · 2026-02-01 11:35:56 +08:00
12 changed files with 1111 additions and 1 deletions
--- a/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.bootinfo
+++ b/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.bootinfo
--- a/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.bootinfo_guids
+++ b/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.bootinfo_guids
--- a/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.compileinfo
+++ b/V2.1.Device.Application.be78cd41-75c9-4adb-9cb3-23e0362aeb3d.compileinfo
--- a/V2.1.Device.Application.xml
+++ b/V2.1.Device.Application.xml
--- a/V2.1.project
+++ b/V2.1.project
--- a/6040-003上料下侧ZA08.cmtp
+++ b/6040-003上料下侧ZA08.cmtp
--- a/6040-003上料下侧ZA08.cmtp.bak1
+++ b/6040-003上料下侧ZA08.cmtp.bak1
--- a/6040-003上料下侧ZA08.cmtp.bak2
+++ b/6040-003上料下侧ZA08.cmtp.bak2
--- a/6040-003上料下侧ZA08.cxob
+++ b/6040-003上料下侧ZA08.cxob
--- a/6040-003上料下侧ZA08.debug
+++ b/6040-003上料下侧ZA08.debug
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 - [ ]  轴功能块和触摸屏心跳
 - [ ]  轴掉线后无法复位
 - [ ]  其他工位HMI IO显示
- - [ ]  伺服画面，轴位置无法设负数
+ - [x]  轴画面不能设负数
+
+

 ### 机器人命令程序号

--- a/doc/~$6040-003设备外形结构和主要元器件位置标注.pptx
+++ b/doc/~$6040-003设备外形结构和主要元器件位置标注.pptx
Author	SHA1	Message	Date
zhusenlin	9b1ab02aa1	解决README的合并冲突	2026-02-01 11:39:01 +08:00
zhusenlin	33fd39bbd4	更新：README	2026-02-01 11:35:56 +08:00