From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交
---
SourceCode/Bond/Servo/CRobotTask.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTask.cpp b/SourceCode/Bond/Servo/CRobotTask.cpp
index 1c9f61d..1b4a1aa 100644
--- a/SourceCode/Bond/Servo/CRobotTask.cpp
+++ b/SourceCode/Bond/Servo/CRobotTask.cpp
@@ -220,7 +220,7 @@
LOGI(_T("RobotTask已下发到EFEM"));
}
else {
- LOGI(_T("RobotTask已下发失败"));
+ LOGI(_T("RobotTask下发失败"));
}
return 0;
--
Gitblit v1.9.3