From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/BondEq/BondEq.vcxproj |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 73727f0..06553f1 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -192,6 +192,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AlarmPopupDlg.h" />
+    <ClInclude Include="CBaseDlg.h" />
     <ClInclude Include="CComponentDlg.h" />
     <ClInclude Include="CComponentPLCDlg.h" />
     <ClInclude Include="CPLC.h" />
@@ -211,6 +212,7 @@
     <ClInclude Include="CPanel.h" />
     <ClInclude Include="CParam.h" />
     <ClInclude Include="CProjectPageComponents.h" />
+    <ClInclude Include="CProjectPageMain.h" />
     <ClInclude Include="CRemoteEqUnitView.h" />
     <ClInclude Include="CRemoteEqView.h" />
     <ClInclude Include="CHomeDialog.h" />
@@ -220,6 +222,7 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="Configuration.h" />
     <ClInclude Include="CPanelProject.h" />
+    <ClInclude Include="DBManager\AlarmManager.h" />
     <ClInclude Include="DBManager\AxisManager.h" />
     <ClInclude Include="DBManager\SystemLogManager.h" />
     <ClInclude Include="DBManager\UserManager.h" />
@@ -245,6 +248,7 @@
     <ClInclude Include="Model.h" />
     <ClInclude Include="CPageAlarm.h" />
     <ClInclude Include="Recipe.h" />
+    <ClInclude Include="RegexEdit.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="SetPage1.h" />
     <ClInclude Include="SetPage2.h" />
@@ -256,15 +260,18 @@
     <ClInclude Include="ToolUnits.h" />
     <ClInclude Include="TopToolbar.h" />
     <ClInclude Include="VerticalLine.h" />
+    <ClInclude Include="View\AxisDetailSettingsDlg.h" />
     <ClInclude Include="View\AxisSettingsDlg.h" />
     <ClInclude Include="View\ChangePasswordDlg.h" />
     <ClInclude Include="View\IOMonitoringDlg.h" />
     <ClInclude Include="View\LoginDlg.h" />
+    <ClInclude Include="View\RecipeListDlg.h" />
     <ClInclude Include="View\SystemLogManagerDlg.h" />
     <ClInclude Include="View\UserManagerDlg.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AlarmPopupDlg.cpp" />
+    <ClCompile Include="CBaseDlg.cpp" />
     <ClCompile Include="CComponentDlg.cpp" />
     <ClCompile Include="CComponentPLCDlg.cpp" />
     <ClCompile Include="CPLC.cpp" />
@@ -284,6 +291,7 @@
     <ClCompile Include="CPanel.cpp" />
     <ClCompile Include="CParam.cpp" />
     <ClCompile Include="CProjectPageComponents.cpp" />
+    <ClCompile Include="CProjectPageMain.cpp" />
     <ClCompile Include="CRemoteEqUnitView.cpp" />
     <ClCompile Include="CRemoteEqView.cpp" />
     <ClCompile Include="CHomeDialog.cpp" />
@@ -292,6 +300,7 @@
     <ClCompile Include="CProjectPageRemoteEqs.cpp" />
     <ClCompile Include="Configuration.cpp" />
     <ClCompile Include="CPanelProject.cpp" />
+    <ClCompile Include="DBManager\AlarmManager.cpp" />
     <ClCompile Include="DBManager\AxisManager.cpp" />
     <ClCompile Include="DBManager\SystemLogManager.cpp" />
     <ClCompile Include="DBManager\UserManager.cpp" />
@@ -318,6 +327,7 @@
     <ClCompile Include="Model.cpp" />
     <ClCompile Include="CPageAlarm.cpp" />
     <ClCompile Include="Recipe.cpp" />
+    <ClCompile Include="RegexEdit.cpp" />
     <ClCompile Include="SetPage1.cpp" />
     <ClCompile Include="SetPage2.cpp" />
     <ClCompile Include="SettingsDlg.cpp" />
@@ -333,10 +343,12 @@
     <ClCompile Include="ToolUnits.cpp" />
     <ClCompile Include="TopToolbar.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
+    <ClCompile Include="View\AxisDetailSettingsDlg.cpp" />
     <ClCompile Include="View\AxisSettingsDlg.cpp" />
     <ClCompile Include="View\ChangePasswordDlg.cpp" />
     <ClCompile Include="View\IOMonitoringDlg.cpp" />
     <ClCompile Include="View\LoginDlg.cpp" />
+    <ClCompile Include="View\RecipeListDlg.cpp" />
     <ClCompile Include="View\SystemLogManagerDlg.cpp" />
     <ClCompile Include="View\UserManagerDlg.cpp" />
   </ItemGroup>

--
Gitblit v1.9.3