From 491e01c98198306bd9d70dea34fe0f8b97bb3fc7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 11 十月 2024 10:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 74be736..37be067 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,67 +2,79 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
- <Compile Update="01-pumpProductManage\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
+ <Compile Update="00-core\SetUseStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\03-PumpType\AddPumpTypeDlg.cs">
+ <Compile Update="01-pump\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\AddPumpProductGroupDlg.cs">
+ <Compile Update="01-pump\03-PumpType\AddPumpTypeDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\AddPumpProductMainDlg.cs">
+ <Compile Update="01-pump\AddPumpProductGroupDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\AddPumpProductSeriesDlg.cs">
+ <Compile Update="01-pump\AddPumpProductMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
+ <Compile Update="01-pump\AddPumpProductSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\EditPumpProductGroupDlg.cs">
+ <Compile Update="01-pump\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\EditPumpProductMainDlg.cs">
+ <Compile Update="01-pump\EditPumpProductGroupDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\EditPumpProductSeriesDlg.cs">
+ <Compile Update="01-pump\EditPumpProductMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\01-EditPumpPartProp\PumpProductListBox.cs">
+ <Compile Update="01-pump\EditPumpProductSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\01-EditPumpPartProp\PumpProductListBox.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\PumpProductMainPanel.cs">
+ <Compile Update="01-pump\PumpProductMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-pumpProductManage\PumpProductSeriesTreeListCtrl.cs">
+ <Compile Update="01-pump\PumpProductSeriesTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-valveManage\02-main\AddValveMainDlg.cs">
+ <Compile Update="03-valve\02-main\AddValveMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-valveManage\02-main\EditValveMainDlg.cs">
+ <Compile Update="03-valve\02-main\EditValveMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-valveManage\ValveManageMainPanel.cs">
+ <Compile Update="03-valve\ValveManageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-pipelineManage\02-main\DescriptionDlg.cs">
+ <Compile Update="04-pipeline\02-main\DescriptionDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="00-core\SetDefaultStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="07-fourLinkManage\01-series\AddPipeLineSeriesDlg.cs">
+ <Compile Update="07-fourLink\01-series\AddPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="07-fourLinkManage\01-series\EditPipeLineSeriesDlg.cs">
+ <Compile Update="07-fourLink\01-series\EditPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="07-fourLinkManage\01-series\PipeLineTreeListCtrl.cs">
+ <Compile Update="07-fourLink\01-series\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="07-fourLinkManage\02-main\FourLinkManageMainPanel.cs">
+ <Compile Update="07-fourLink\02-main\FourLinkManageMainPanel.cs">
+ <SubType>UserControl</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\ManufacturerMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
--
Gitblit v1.9.3