From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/CPanelEquipment.h b/SourceCode/Bond/Servo/CPanelEquipment.h
index 460e858..9aa3580 100644
--- a/SourceCode/Bond/Servo/CPanelEquipment.h
+++ b/SourceCode/Bond/Servo/CPanelEquipment.h
@@ -14,11 +14,13 @@
 	virtual ~CPanelEquipment();
 	int getPanelWidth();
 	void SetEquipment(SERVO::CEquipment* pEquipment);
+	void loadDataFromEquipment(SERVO::CEquipment* pEquipment);
 
 private:
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
 	int m_nPanelWidth;
+	CMFCPropertyGridCtrl m_gridCtrl;
 	CBlButton m_btnClose;
 	SERVO::CEquipment* m_pEquipment;
 

--
Gitblit v1.9.3