冲突

duheng

2024-08-14 71ff3ccde064c104db61fa28300b039456c0ba06

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

@@ -8,6 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.5" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.1.6" />
  </ItemGroup>
@@ -15,6 +16,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\Hydro\Yw.Hydro.Core\Yw.Hydro.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" />
  </ItemGroup>

  <ItemGroup>