From cacea2da59a3acd73f3161d819a10e0060762616 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 06 五月 2025 14:54:13 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ProductionLogDlg.h b/SourceCode/Bond/Servo/ProductionLogDlg.h
index 44f8d03..f9ff622 100644
--- a/SourceCode/Bond/Servo/ProductionLogDlg.h
+++ b/SourceCode/Bond/Servo/ProductionLogDlg.h
@@ -17,7 +17,6 @@
 private:
 	void InitRxWindow();
 	void Resize();
-	void LoadAlarms();
 	void UpdatePageData();
 	void UpdatePageControls();
 	void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<ProductionStep>& vecSteps);

--
Gitblit v1.9.3