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.filters | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
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" />
--
Gitblit v1.9.3