From 9afc96a7f7f759ae42fbe598a88a865fe737c6bd Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期二, 10 十二月 2024 10:43:21 +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 | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj index 4fcf4b8..f7d56d6 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj @@ -57,8 +57,6 @@ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" /> <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" /> <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.Designer.cs" /> - <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs" /> - <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.Designer.cs" /> <Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" /> <Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" /> <Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" /> @@ -99,7 +97,6 @@ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" /> <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" /> <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.resx" /> <EmbeddedResource Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" /> <EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" /> <EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" /> @@ -149,7 +146,6 @@ </ItemGroup> <ItemGroup> - <Folder Include="03-simulation\04-scheme\01-info\" /> <Folder Include="03-simulation\07-matching\00-core\" /> <Folder Include="map\gaode\css\" /> </ItemGroup> @@ -185,6 +181,9 @@ <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs" /> <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs" /> <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs" /> + <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> <Compile Update="03-simulation\07-matching\09-Tank\TankChartShowDlg.cs" /> <Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs" /> <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs" /> -- Gitblit v1.9.3