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

diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 727a7d9..fb73f36 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.h
+++ b/SourceCode/Bond/Servo/CPortStatusReport.h
@@ -31,6 +31,7 @@
 		bool isJobExistenceSlot();
 		short getJobExistenceSlot();
 		void setJobExistenceSlot(short map);
+		void setCassetteId(const char* pszId);
 
 	private:
 		void WriteString(CArchive& ar, std::string& string);

--
Gitblit v1.9.3