冲突

Shuxia Ning

2024-12-11 f02df8852f3adbebd6c50a6c0077065ca18ccd84

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj

@@ -28,6 +28,8 @@
    <Compile Remove="99-common\PumpVariableSpeedChartDlg.Designer.cs" />
    <Compile Remove="99-common\PumpWorkChartDlg.cs" />
    <Compile Remove="99-common\PumpWorkChartDlg.Designer.cs" />
    <Compile Remove="99-common\PumpWorkComparisonChartDlg.cs" />
    <Compile Remove="99-common\PumpWorkComparisonChartDlg.Designer.cs" />
    <Compile Remove="PumpParallelAnalyDlg - 复制.cs" />
    <Compile Remove="PumpParallelAnalyDlg - 复制.Designer.cs" />
    <Compile Remove="PumpParallelAnalyDlg.cs" />
@@ -40,6 +42,7 @@
    <EmbeddedResource Remove="99-common\PumpSerialParallelChartDlg.resx" />
    <EmbeddedResource Remove="99-common\PumpVariableSpeedChartDlg.resx" />
    <EmbeddedResource Remove="99-common\PumpWorkChartDlg.resx" />
    <EmbeddedResource Remove="99-common\PumpWorkComparisonChartDlg.resx" />
    <EmbeddedResource Remove="PumpParallelAnalyDlg - 复制.resx" />
    <EmbeddedResource Remove="PumpParallelAnalyDlg.resx" />
  </ItemGroup>
@@ -68,14 +71,8 @@
    <Compile Update="01-pump-main\SetImportanceDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump-main\XhsPumpMainPhartPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-valve-main\XhsValveMainPhartListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="99-common\PumpWorkComparisonChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="99-common\SelXhsValveMainPhartDlg.cs">
      <SubType>Form</SubType>