1. 代码合并冲突，重新提交

mrDarker

2025-09-08 4849a5172d454dd2f95a956f4662606f5f3a68ff

 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;