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/Servo/CPagePortProperty.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPagePortProperty.h b/SourceCode/Bond/Servo/CPagePortProperty.h
index f7e159c..7be09fb 100644
--- a/SourceCode/Bond/Servo/CPagePortProperty.h
+++ b/SourceCode/Bond/Servo/CPagePortProperty.h
@@ -37,4 +37,9 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnBnClickedCheckEnable();
+	afx_msg void OnCbnSelchangeComboPortType();
+	afx_msg void OnCbnSelchangeComboPortMode();
+	afx_msg void OnCbnSelchangeComboPortCassertType();
+	afx_msg void OnCbnSelchangeComboPortTransferMode();
+	afx_msg void OnBnClickedCheckAutoChange();
 };

--
Gitblit v1.9.3