Merge branch 'clh' into liuyang

mrDarker

7 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/EAPSimulator/CCollectionEvent.h

@@ -16,6 +16,7 @@
      std::string& getName();
      std::string& getDescription();
      std::vector<CReport*>& getReports();
      std::vector<unsigned int>& getReportIds();
      std::string getReportIdsText();
      BOOL addReport(CReport* pReport);
      BOOL deleteReport(unsigned int nReportId);