From 02cde90c53b4a80252be2944f6d53a368b7252ba Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 14 十月 2024 13:25:04 +0800
Subject: [PATCH] 冲突（变速曲线）
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user | 106 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
index 186845f..6c2f54e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
@@ -2,38 +2,122 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
- <Compile Update="00-PumpProductManage\PumpPartDlg.cs">
+ <Compile Update="00-core\SetUseStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\PumpProductMainPanel.cs">
+ <Compile Update="01-pump\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-PumpType\AddPumpTypeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductGroupDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductGroupDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\01-EditPumpPartProp\PumpProductListBox.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\PumpProductSeriesTreeListCtrl.cs">
+ <Compile Update="01-pump\PumpProductMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-UICore\00-DocumentPage\DocumentPage.cs">
+ <Compile Update="01-pump\PumpProductSeriesTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-UICore\00-DocumentPage\MainForm.cs">
+ <Compile Update="03-valve\01-series\AddValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductGroupDlg.cs">
+ <Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductMainDlg.cs">
+ <Compile Update="03-valve\02-main\AddValveMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductSeriesDlg.cs">
+ <Compile Update="03-valve\02-main\EditValveMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductGroupDlg.cs">
+ <Compile Update="03-valve\ValveManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductMainDlg.cs">
+ <Compile Update="04-pipe\02-main\DescriptionDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductSeriesDlg.cs">
+ <Compile Update="00-core\SetDefaultStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\EditElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\AddThreeLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\AddPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\PipeLineTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\FourLinkManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\AddManufacturerDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\EditManufacturerDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\ManufacturerMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-equipment\ManufacturerMainPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3