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

diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index c74568e..dcb3c56 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -23,6 +23,7 @@
 		inline void nextStep();
 		inline void resetStep();
 		virtual int setReturnCode(short code);
+		virtual int setReturnData(const char* pszData, unsigned int size);
 
 	protected:
 		HANDLE m_hWorkThreadHandle;

--
Gitblit v1.9.3