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

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

diff --git a/SourceCode/Bond/Servo/CPanelMaster.h b/SourceCode/Bond/Servo/CPanelMaster.h
index bea8068..15bd2db 100644
--- a/SourceCode/Bond/Servo/CPanelMaster.h
+++ b/SourceCode/Bond/Servo/CPanelMaster.h
@@ -14,7 +14,7 @@
 	int getPanelWidth();
 	void loadEquipmentList();
 	void loadSteps(SERVO::CEquipment* pEquipment, HTREEITEM hItemEq);
-
+	SERVO::CEquipment* GetActiveEquipment();
 
 private:
 	int GetTreeItemLevel(HTREEITEM hItem);

--
Gitblit v1.9.3