From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj b/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
index 164182d..edc7445 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
@@ -193,13 +193,17 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\BondEq\HorizontalLine.h" />
+    <ClInclude Include="AddPLCInfo.h" />
     <ClInclude Include="Alarm.h" />
     <ClInclude Include="AlarmMonitor.h" />
     <ClInclude Include="AlarmPopupDlg.h" />
     <ClInclude Include="ApredTreeCtrl.h" />
+    <ClInclude Include="AxisDetailSettingsDlg.h" />
+    <ClInclude Include="AxisSettingsDlg.h" />
     <ClInclude Include="BlButton.h" />
     <ClInclude Include="BoounionPLC.h" />
     <ClInclude Include="BoounionPLCDlg.h" />
+    <ClInclude Include="CBaseDlg.h" />
     <ClInclude Include="CBaseView.h" />
     <ClInclude Include="CMainContainer.h" />
     <ClInclude Include="Common.h" />
@@ -208,13 +212,12 @@
     <ClInclude Include="Context.h" />
     <ClInclude Include="CPageLogcat.h" />
     <ClInclude Include="DBManager\AlarmManager.h" />
-    <ClInclude Include="DBManager\AxisManager.h" />
     <ClInclude Include="DBManager\SystemLogManager.h" />
     <ClInclude Include="DBManager\UserManager.h" />
+    <ClInclude Include="FileManager\AxisManager.h" />
     <ClInclude Include="FileManager\IOManager.h" />
     <ClInclude Include="FileManager\pugiconfig.hpp" />
     <ClInclude Include="FileManager\pugixml.hpp" />
-    <ClInclude Include="FileManager\RecipeManager.h" />
     <ClInclude Include="InputDialog.h" />
     <ClInclude Include="Intent.h" />
     <ClInclude Include="IOMonitoringDlg.h" />
@@ -237,13 +240,17 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\BondEq\HorizontalLine.cpp" />
+    <ClCompile Include="AddPLCInfo.cpp" />
     <ClCompile Include="Alarm.cpp" />
     <ClCompile Include="AlarmMonitor.cpp" />
     <ClCompile Include="AlarmPopupDlg.cpp" />
     <ClCompile Include="ApredTreeCtrl.cpp" />
+    <ClCompile Include="AxisDetailSettingsDlg.cpp" />
+    <ClCompile Include="AxisSettingsDlg.cpp" />
     <ClCompile Include="BlButton.cpp" />
     <ClCompile Include="BoounionPLC.cpp" />
     <ClCompile Include="BoounionPLCDlg.cpp" />
+    <ClCompile Include="CBaseDlg.cpp" />
     <ClCompile Include="CBaseView.cpp" />
     <ClCompile Include="CMainContainer.cpp" />
     <ClCompile Include="Component.cpp" />
@@ -253,15 +260,14 @@
     <ClCompile Include="DBManager\AlarmManager.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="DBManager\AxisManager.cpp" />
     <ClCompile Include="DBManager\SystemLogManager.cpp" />
     <ClCompile Include="DBManager\UserManager.cpp" />
+    <ClCompile Include="FileManager\AxisManager.cpp" />
     <ClCompile Include="FileManager\IOManager.cpp" />
     <ClCompile Include="FileManager\pugixml.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="FileManager\RecipeManager.cpp" />
     <ClCompile Include="InputDialog.cpp" />
     <ClCompile Include="Intent.cpp" />
     <ClCompile Include="IOMonitoringDlg.cpp" />

--
Gitblit v1.9.3