冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

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

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

   <ItemGroup>
     <Compile Remove="04-viewmodel\00-core\**" />
     <Compile Remove="12-monitor\00-core\**" />
     <EmbeddedResource Remove="04-viewmodel\00-core\**" />
     <EmbeddedResource Remove="12-monitor\00-core\**" />
     <None Remove="04-viewmodel\00-core\**" />
     <None Remove="12-monitor\00-core\**" />
     <Page Remove="04-viewmodel\00-core\**" />
     <Page Remove="12-monitor\00-core\**" />
   </ItemGroup>

   <ItemGroup>
      <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 复制.cs" />
      <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 复制.Designer.cs" />
      <Compile Remove="06-visual\00-core\HydroParterListCtrl.cs" />
@@ -42,8 +53,8 @@
   <ItemGroup>
      <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
      <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.0" />
      <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.7.6" />
      <PackageReference Include="Yw.Pump.Core" Version="3.1.7" />
      <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.8.1" />
      <PackageReference Include="Yw.Pump.Core" Version="3.2.1" />
   </ItemGroup>

   <ItemGroup>
@@ -384,8 +395,7 @@
   </ItemGroup>

   <ItemGroup>
      <Folder Include="04-viewmodel\00-core\" />
      <Folder Include="12-monitor\00-core\" />
     <Folder Include="04-viewmodel\08-validation\" />
   </ItemGroup>

</Project>