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

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

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 32bf429..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
@@ -36,4 +37,6 @@
 	CListCtrl m_listPPID;
 public:
 	afx_msg void OnDestroy();
+	afx_msg void OnCbnSelchangeComboEquipment();
+	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
 };

--
Gitblit v1.9.3