1. 代码合并冲突，重新提交

mrDarker

2025-09-08 4849a5172d454dd2f95a956f4662606f5f3a68ff

1. 代码合并冲突，重新提交

 SourceCode/Bond/Servo/Servo.rc

Binary files differ

 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" />

 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" />

 SourceCode/Bond/Servo/resource.h

Binary files differ