From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

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

diff --git a/SourceCode/Bond/BoounionPLC/PlcView.h b/SourceCode/Bond/BoounionPLC/PlcView.h
index 1b63539..27a3e52 100644
--- a/SourceCode/Bond/BoounionPLC/PlcView.h
+++ b/SourceCode/Bond/BoounionPLC/PlcView.h
@@ -53,6 +53,8 @@
 private:
 	// 控件
 	CBlButton* m_pBlBtns[BTN_MAX];
+	COLORREF m_crPlcNameBack;
+	HBRUSH m_hbrPlcName;
 
 	// 对话框数据
 #ifdef AFX_DESIGN_TIME

--
Gitblit v1.9.3