From 405bd36e812c3645e8d9d84700777e2eaeb036ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 30 五月 2025 16:18:17 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/CMaster.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 2a2b9c0..93ff6cc 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -82,6 +82,7 @@
         int readCache();
         void serialize(CArchive& ar);
         void setState(MASTERSTATE state);
+        CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq);
 
     private:
         CRITICAL_SECTION m_criticalSection;

--
Gitblit v1.9.3