From 1fd6271242b881c26a131289ddfcfe7fd68dbaed Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 14 一月 2025 17:39:20 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BoounionPLC/Model.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/Model.h b/SourceCode/Bond/BoounionPLC/Model.h
index 48a52cb..55401e4 100644
--- a/SourceCode/Bond/BoounionPLC/Model.h
+++ b/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;

--
Gitblit v1.9.3