From b7d98aad7e8728c5a41c6fab5a21b6c633042527 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 11:43:13 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

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

diff --git a/SourceCode/Bond/Servo/PageTransferLog.h b/SourceCode/Bond/Servo/PageTransferLog.h
index 1a26e90..3cb3f0c 100644
--- a/SourceCode/Bond/Servo/PageTransferLog.h
+++ b/SourceCode/Bond/Servo/PageTransferLog.h
@@ -36,7 +36,7 @@
 	CDateTimeCtrl m_dateTimeEnd;
 	CListCtrlEx m_listCtrl;
 
-	void InitRxWindow();
+	void InitRxWindows();
 	void Resize();
 	void InitStatusCombo();
 	void InitTimeRangeCombo();
@@ -66,5 +66,6 @@
 	afx_msg void OnBnClickedButtonExport();
 	afx_msg void OnBnClickedButtonPrevPage();
 	afx_msg void OnBnClickedButtonNextPage();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3