From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index ca955ad..5414610 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -16,6 +16,9 @@
     <Compile Update="01-home\HomeXhsProjectPage_Bak.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="02-project\01-import\01-ModelFile\SelectXhsProjectModelFileWizardPage.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -40,6 +43,45 @@
     <Compile Update="02-project\04-dlg\AddProjectDlg.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Update="03-scheme\01-basic-info\XhsProjectBasicInfoBimfaceCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\01-basic-info\XhsProjectBasicInfoHydroCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\01-basic-info\XhsProjectBasicInfoViewCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\01-basic-info\XhsSchemeBasicInfoPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\PumpMain\AddPumpMainDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\PumpMain\ChoicePumpMainDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\PumpMain\PumpMainForm.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\PumpMain\PumpMainChoicePage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\PumpMain\ValveChoicePage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\XhsProjectAssetsBimfaceCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\02-asset-mgr\XhsProjectAssetsPropertyCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\03-hydraulic-simulation\XhsProjectHydroQ3dCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-scheme\04-scheme-mgr\01-create\CreateSchemeDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="03-scheme\XhsSchemeMgrListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>

--
Gitblit v1.9.3