Merge branch 'master' into liuyang

mrDarker

2025-06-12 6d71f1d8264b929ca71bf133246b894ed955c079

 SourceCode/Bond/BoounionPLC/Model.h

@@ -46,7 +46,7 @@
   IObservableEmitter* m_pObservableEmitter;
   CString m_strWorkDir;
   std::map<std::string, CPLC*> m_mapPlc;
   std::string m_strCurrPlc;
   CPLC* m_pActivePlc;

private:
   int m_nTimerID;