From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 7c55823..3b20373 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -198,8 +198,10 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="CBaseDlg.h" />
     <ClInclude Include="CEquipmentPage3.h" />
     <ClInclude Include="CGlassPool.h" />
+    <ClInclude Include="ChangePasswordDlg.h" />
     <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CPageLinkSignal.h" />
     <ClInclude Include="CRobotCmdContainerDlg.h" />
@@ -224,7 +226,9 @@
     <ClInclude Include="CRobotTask.h" />
     <ClInclude Include="CSlot.h" />
     <ClInclude Include="HorizontalLine.h" />
+    <ClInclude Include="InputDialog.h" />
     <ClInclude Include="JobSlotGrid.h" />
+    <ClInclude Include="LoginDlg.h" />
     <ClInclude Include="MsgDlg.h" />
     <ClInclude Include="PageRecipe.h" />
     <ClInclude Include="CDoubleGlass.h" />
@@ -313,6 +317,8 @@
     <ClInclude Include="PageTransferLog.h" />
     <ClInclude Include="PortConfigurationDlg.h" />
     <ClInclude Include="ProductionLogManager.h" />
+    <ClInclude Include="RecipeDeviceBindDlg.h" />
+    <ClInclude Include="RecipeManager.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="SECSRuntimeManager.h" />
     <ClInclude Include="SecsTestDlg.h" />
@@ -322,16 +328,22 @@
     <ClInclude Include="ServoGraph.h" />
     <ClInclude Include="ServoMemDC.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="SystemLogManager.h" />
+    <ClInclude Include="SystemLogManagerDlg.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="TerminalDisplayDlg.h" />
     <ClInclude Include="ToolUnits.h" />
     <ClInclude Include="TransferManager.h" />
     <ClInclude Include="TopToolbar.h" />
+    <ClInclude Include="UserManager.h" />
+    <ClInclude Include="UserManagerDlg.h" />
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="CBaseDlg.cpp" />
     <ClCompile Include="CEquipmentPage3.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
+    <ClCompile Include="ChangePasswordDlg.cpp" />
     <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CPageLinkSignal.cpp" />
     <ClCompile Include="CRobotCmdContainerDlg.cpp" />
@@ -354,7 +366,9 @@
     <ClCompile Include="CRobotTask.cpp" />
     <ClCompile Include="CSlot.cpp" />
     <ClCompile Include="HorizontalLine.cpp" />
+    <ClCompile Include="InputDialog.cpp" />
     <ClCompile Include="JobSlotGrid.cpp" />
+    <ClCompile Include="LoginDlg.cpp" />
     <ClCompile Include="MsgDlg.cpp" />
     <ClCompile Include="PageRecipe.cpp" />
     <ClCompile Include="CDoubleGlass.cpp" />
@@ -442,6 +456,8 @@
     <ClCompile Include="PageTransferLog.cpp" />
     <ClCompile Include="PortConfigurationDlg.cpp" />
     <ClCompile Include="ProductionLogManager.cpp" />
+    <ClCompile Include="RecipeDeviceBindDlg.cpp" />
+    <ClCompile Include="RecipeManager.cpp" />
     <ClCompile Include="SECSRuntimeManager.cpp" />
     <ClCompile Include="SecsTestDlg.cpp" />
     <ClCompile Include="Servo.cpp" />
@@ -454,10 +470,14 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="SystemLogManager.cpp" />
+    <ClCompile Include="SystemLogManagerDlg.cpp" />
     <ClCompile Include="TerminalDisplayDlg.cpp" />
     <ClCompile Include="ToolUnits.cpp" />
     <ClCompile Include="TransferManager.cpp" />
     <ClCompile Include="TopToolbar.cpp" />
+    <ClCompile Include="UserManager.cpp" />
+    <ClCompile Include="UserManagerDlg.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
   </ItemGroup>
   <ItemGroup>

--
Gitblit v1.9.3