From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/RecipeManager.h b/SourceCode/Bond/Servo/RecipeManager.h
index f25d36c..b27b026 100644
--- a/SourceCode/Bond/Servo/RecipeManager.h
+++ b/SourceCode/Bond/Servo/RecipeManager.h
@@ -10,8 +10,8 @@
 // 单个设备配方映射信息
 struct DeviceRecipe {
     int nDeviceID;               // 设备ID
-    int nRecipeID;               // 该设备对应的子配方ID
-    std::string strPPID;         // 配方ID(主键)
+    int nRecipeID;               // 子配方ID
+	std::string strRecipeName;   // 子配方名称
     std::string strDeviceName;   // 设备名称 
 };
 

--
Gitblit v1.9.3