冲突

yangyin

2024-08-12 2bc7800e9f02fed6652f6b0defe1d978f186e914

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj

@@ -15,12 +15,23 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="00-PumpProductManage\AddPumpProductMainDlg - 复制.cs" />
    <Compile Remove="00-PumpProductManage\AddPumpProductMainDlg - 复制.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="00-PumpProductManage\AddPumpProductMainDlg - 复制.resx" />
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
    <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
  </ItemGroup>