From 2fc5bbfe88adefb0d2f8ba55d800fe074264a539 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 14 二月 2025 14:16:27 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 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