冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user

@@ -2,67 +2,121 @@
<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\03-PumpType\EditPumpTypeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\AddPumpProductSeriesDlg.cs">
    <Compile Update="01-pump\AddPumpProductGroupDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
    <Compile Update="01-pump\AddPumpProductMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\EditPumpProductGroupDlg.cs">
    <Compile Update="01-pump\AddPumpProductSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\EditPumpProductMainDlg.cs">
    <Compile Update="01-pump\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\EditPumpProductSeriesDlg.cs">
    <Compile Update="01-pump\EditPumpProductGroupDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pumpProductManage\01-EditPumpPartProp\PumpProductListBox.cs">
    <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="01-pumpProductManage\PumpProductMainPanel.cs">
    <Compile Update="01-pump\PumpProductMainPage.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\01-series\AddValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valveManage\02-main\EditValveMainDlg.cs">
    <Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valveManage\ValveManageMainPanel.cs">
    <Compile Update="03-valve\02-main\AddValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\02-main\EditValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\ValveManageMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipelineManage\02-main\DescriptionDlg.cs">
    <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\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="04-pipe\02-main\EditPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLinkManage\01-series\EditPipeLineSeriesDlg.cs">
    <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLinkManage\01-series\PipeLineTreeListCtrl.cs">
    <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-fourLinkManage\02-main\FourLinkManageMainPanel.cs">
    <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>