From c0be7c001375f73e2c3b49a1b1d447b6fc297bdd Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 21 三月 2025 13:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
index e1d4412..2c250d9 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
@@ -21,6 +21,8 @@
<ItemGroup>
<Compile Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.cs" />
<Compile Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.Designer.cs" />
+ <Compile Remove="02-quick-modeling\02-place\QuickModelingPlaceWizardPage - 澶嶅埗.cs" />
+ <Compile Remove="02-quick-modeling\02-place\QuickModelingPlaceWizardPage - 澶嶅埗.Designer.cs" />
<Compile Remove="02-quick-modeling\NetWorkModelHelper.cs" />
<Compile Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.cs" />
<Compile Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.Designer.cs" />
@@ -36,6 +38,7 @@
<ItemGroup>
<EmbeddedResource Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="02-quick-modeling\02-place\QuickModelingPlaceWizardPage - 澶嶅埗.resx" />
<EmbeddedResource Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.resx" />
<EmbeddedResource Remove="02-quick-modeling\QuickModelingPage1.resx" />
<EmbeddedResource Remove="03-system-curve\SystemCurvePage - 澶嶅埗.resx" />
@@ -70,9 +73,15 @@
<Compile Update="02-quick-modeling\03-facility\QuickModelingFacilityWizardPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-model-edit\ModelEditPage.cs">
+ <Compile Update="04-model-edit\00-core\ModelEditPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="04-model-edit\01-tree\FacilityTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-model-edit\InputDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="99-map-view\Class1.cs" />
<Compile Update="99-map-view\DMap.cs">
<SubType>Component</SubType>
--
Gitblit v1.9.3