From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交
---
SourceCode/Bond/Servo/Servo.vcxproj | 2 ++
SourceCode/Bond/Servo/Servo.vcxproj.filters | 2 ++
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/Servo.rc | 0
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 6001bb6..6c21d7d 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index cee27dc..62e40d5 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -232,6 +232,7 @@
<ClInclude Include="CPortStatusReport.h" />
<ClInclude Include="CRobotTaskDlg.h" />
<ClInclude Include="CVariable.h" />
+ <ClInclude Include="DeviceRecipeParamDlg.h" />
<ClInclude Include="GlassJson.h" />
<ClInclude Include="GridControl\CellRange.h" />
<ClInclude Include="GridControl\GridCell.h" />
@@ -401,6 +402,7 @@
<ClCompile Include="CPortStatusReport.cpp" />
<ClCompile Include="CRobotTaskDlg.cpp" />
<ClCompile Include="CVariable.cpp" />
+ <ClCompile Include="DeviceRecipeParamDlg.cpp" />
<ClCompile Include="GlassJson.cpp" />
<ClCompile Include="GridControl\GridCell.cpp" />
<ClCompile Include="GridControl\GridCellBase.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index e8763fd..8981dfe 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -192,6 +192,7 @@
<ClCompile Include="..\jsoncpp\lib_json\json_writer.cpp">
<Filter>JsonCpp</Filter>
</ClCompile>
+ <ClCompile Include="DeviceRecipeParamDlg.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -408,6 +409,7 @@
<ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h">
<Filter>JsonCpp</Filter>
</ClInclude>
+ <ClInclude Include="DeviceRecipeParamDlg.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index e0cd278..ad5b964 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
--
Gitblit v1.9.3