From 6fc65c5cf54432d1044fbe9799aca76f7273798c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 23 五月 2025 18:02:27 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/ServoDlg.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ce6cb8d..f78d8c5 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -4,8 +4,9 @@
 
 #pragma once
 #include "BlButton.h"
-#include "LogDlg.h"
-#include "AlarmDlg.h"
+#include "PageLog.h"
+#include "PageAlarm.h"
+#include "PageRecipe.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
 #include "CPanelEquipment.h"
@@ -36,8 +37,9 @@
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
-	CAlarmDlg*	 m_pPageAlarm;
-	CLogDlg*	 m_pPageLog;
+	CPageRecipe* m_pPageRecipe;
+	CPageAlarm*	 m_pPageAlarm;
+	CPageLog*	 m_pPageLog;
 
 
 // 对话框数据
@@ -54,8 +56,6 @@
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
-	CBlButton m_btnLog;
-	CBlButton m_btnAlarm;
 	CPanelMaster* m_pPanelMaster;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;

--
Gitblit v1.9.3