冲突

duheng

2025-03-18 7ee0220b5f5626deef516b6e5c417bfa201e5a88

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/PBS.WinFrmUI.DataAnalysis.csproj

@@ -19,11 +19,14 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="EnergyAnalysis.cs" />
    <Compile Remove="EnergyAnalysis.Designer.cs" />
    <Compile Remove="PumpViewChart.cs" />
    <Compile Remove="PumpViewChart.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="EnergyAnalysis.resx" />
    <EmbeddedResource Remove="PumpViewChart.resx" />
  </ItemGroup>

@@ -37,6 +40,9 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="EndPressAnalysis.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>