冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj

@@ -10,7 +10,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.2.6" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.2.9" />
  </ItemGroup>

  <ItemGroup>
@@ -79,10 +79,10 @@
    <Compile Update="04-parter\17-pipe\HydroPipeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="06-l2d\HydroL2dViewPage.cs">
    <Compile Update="07-l2d\HydroL2dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-l3d\HydroL3dViewPage.cs">
    <Compile Update="08-l3d\HydroL3dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">