From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/PageRecipe.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 5df946e..55baf65 100644
--- a/SourceCode/Bond/Servo/PageRecipe.h
+++ b/SourceCode/Bond/Servo/PageRecipe.h
@@ -14,6 +14,7 @@
 
 private:
 	void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe);
+	void FillRecipeListToListCtrl(SERVO::CRecipeList* pList);
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -34,6 +35,8 @@
 
 private:
 	CListCtrl m_listPPID;
-	CEdit m_editPPID;
-	CEdit m_editDesc;
+public:
+	afx_msg void OnDestroy();
+	afx_msg void OnCbnSelchangeComboEquipment();
+	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
 };

--
Gitblit v1.9.3