From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index 0c35245..fc226d5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -8,24 +8,28 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="01-pump\00- - 澶嶅埗\**" />
<Compile Remove="01-pump\00-\**" />
<Compile Remove="01-pump\02-multi\02-work\**" />
<Compile Remove="bak2\**" />
<Compile Remove="v1 - 澶嶅埗\**" />
<Compile Remove="bak\**" />
<Compile Remove="v2\**" />
+ <EmbeddedResource Remove="01-pump\00- - 澶嶅埗\**" />
<EmbeddedResource Remove="01-pump\00-\**" />
<EmbeddedResource Remove="01-pump\02-multi\02-work\**" />
<EmbeddedResource Remove="bak2\**" />
<EmbeddedResource Remove="v1 - 澶嶅埗\**" />
<EmbeddedResource Remove="bak\**" />
<EmbeddedResource Remove="v2\**" />
+ <None Remove="01-pump\00- - 澶嶅埗\**" />
<None Remove="01-pump\00-\**" />
<None Remove="01-pump\02-multi\02-work\**" />
<None Remove="bak2\**" />
<None Remove="v1 - 澶嶅埗\**" />
<None Remove="bak\**" />
<None Remove="v2\**" />
+ <Page Remove="01-pump\00- - 澶嶅埗\**" />
<Page Remove="01-pump\00-\**" />
<Page Remove="01-pump\02-multi\02-work\**" />
<Page Remove="bak2\**" />
@@ -51,7 +55,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.Pump.Core" Version="3.1.5" />
+ <PackageReference Include="Yw.Pump.Core" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3