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

diff --git a/SourceCode/Bond/Servo/CCollectionEvent.h b/SourceCode/Bond/Servo/CCollectionEvent.h
index 55e4c1f..a0b023d 100644
--- a/SourceCode/Bond/Servo/CCollectionEvent.h
+++ b/SourceCode/Bond/Servo/CCollectionEvent.h
@@ -21,6 +21,11 @@
 		BOOL deleteReport(unsigned int nReportId);
 		CReport* getReport(unsigned int nReportId);
 
+		/* 如果一个CEID只有一个Report的场景,调用此函数设置或取消 */
+		void setReport(CReport* pReport);
+		unsigned int getFirstPortID();
+		CReport* getFirstReport();
+
 	private:
 		unsigned int m_nCEID;
 		std::string m_strName;

--
Gitblit v1.9.3