Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-12-02 dbcef6befb123066754141adef6dc3ef6653b6ce

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

@@ -18,15 +18,24 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="99-common\PumpParallelChartDlg.cs" />
    <Compile Remove="99-common\PumpParallelChartDlg.Designer.cs" />
    <Compile Remove="99-common\PumpPerform2dMultiViewDlg - 复制.cs" />
    <Compile Remove="99-common\PumpPerform2dMultiViewDlg - 复制.Designer.cs" />
    <Compile Remove="99-common\PumpSerialParallelChartDlg.cs" />
    <Compile Remove="99-common\PumpSerialParallelChartDlg.Designer.cs" />
    <Compile Remove="PumpParallelAnalyDlg - 复制.cs" />
    <Compile Remove="PumpParallelAnalyDlg - 复制.Designer.cs" />
    <Compile Remove="PumpParallelAnalyDlg.cs" />
    <Compile Remove="PumpParallelAnalyDlg.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="99-common\PumpParallelChartDlg.resx" />
    <EmbeddedResource Remove="99-common\PumpPerform2dMultiViewDlg - 复制.resx" />
    <EmbeddedResource Remove="99-common\PumpSerialParallelChartDlg.resx" />
    <EmbeddedResource Remove="PumpParallelAnalyDlg - 复制.resx" />
    <EmbeddedResource Remove="PumpParallelAnalyDlg.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -59,9 +68,6 @@
    <Compile Update="02-valve-main\XhsValveMainPhartListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="99-common\PumpParallelChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="99-common\PumpWorkComparisonChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -69,9 +75,6 @@
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="99-common\PumpVariableSpeedChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="99-common\PumpSerialParallelChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="99-common\SelXhsValveMainPhartDlg.cs">