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/CRobotTaskDlg.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRobotTaskDlg.h b/SourceCode/Bond/Servo/CRobotTaskDlg.h
index 9226dcb..3ab967c 100644
--- a/SourceCode/Bond/Servo/CRobotTaskDlg.h
+++ b/SourceCode/Bond/Servo/CRobotTaskDlg.h
@@ -22,6 +22,7 @@
 private:
 	SERVO::CRobotTask* m_pRobotTask;
 	CButton m_btnAbortTask;
+	CButton m_btnRestore;
 	CFont m_fontButton;
 	CFont m_fontDetail;
 
@@ -42,4 +43,5 @@
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
 	afx_msg void OnBnClickedAbortTask();
+	afx_msg void OnBnClickedRestore();
 };

--
Gitblit v1.9.3