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/EAPSimulator/CCollectionEvent.cpp | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/CCollectionEvent.cpp b/SourceCode/Bond/EAPSimulator/CCollectionEvent.cpp
index fcb5e86..abb12d4 100644
--- a/SourceCode/Bond/EAPSimulator/CCollectionEvent.cpp
+++ b/SourceCode/Bond/EAPSimulator/CCollectionEvent.cpp
@@ -87,6 +87,11 @@
return m_reports;
}
+ std::vector<unsigned int>& CCollectionEvent::getReportIds()
+ {
+ return m_rptids;
+ }
+
std::string CCollectionEvent::getReportIdsText()
{
std::string strResult, strName;
--
Gitblit v1.9.3