From 69d1e03745175dadece54b1dfce0738d5b5d8961 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 19 二月 2025 15:54:47 +0800
Subject: [PATCH] Merge branch 'master' into clh

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

diff --git a/SourceCode/Bond/Servo/DevicePropertyDlg.cpp b/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
index 8a115d2..82f4c6f 100644
--- a/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
+++ b/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
@@ -51,7 +51,7 @@
 
 	// 鑾峰彇鎵�鏈夎澶囧睘鎬�
 	std::vector<std::pair<std::string, std::string>> properties;
-	//pEquipment->getProperties(properties);
+	pEquipment->getProperties(properties);
 
 	// 鑾峰彇ListCtrl鐨勫鎴峰尯鍩�
 	CRect rect;

--
Gitblit v1.9.3