From 8ffc831c6bf37a73961e22efc145be4e8c8f1241 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 10:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 69f4cab..5df946e 100644
--- a/SourceCode/Bond/Servo/PageRecipe.h
+++ b/SourceCode/Bond/Servo/PageRecipe.h
@@ -1,7 +1,6 @@
 锘�#pragma once
 #include "afxdialogex.h"
-//#include "ListCtrlEx.h"
-
+#include "RecipeManager.h"
 
 // CPageRecipe 瀵硅瘽妗�
 
@@ -14,7 +13,7 @@
 	virtual ~CPageRecipe();
 
 private:
-	void FillDataToListCtrl(const std::vector<std::string>& vecData);
+	void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe);
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -24,11 +23,11 @@
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	virtual BOOL OnInitDialog();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnBnClickedButtonSearch();
 	afx_msg void OnBnClickedButtonModify();
 	afx_msg void OnBnClickedButtonDelete();
 	afx_msg void OnBnClickedButtonDeleteAll();
-	afx_msg void OnBnClickedButtonSave();
 	afx_msg void OnBnClickedButtonRefresh();
 	afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult);
 	DECLARE_MESSAGE_MAP()
@@ -36,4 +35,5 @@
 private:
 	CListCtrl m_listPPID;
 	CEdit m_editPPID;
+	CEdit m_editDesc;
 };

--
Gitblit v1.9.3