From abf3ceabdd98abd0d955b03732e581a43c4e9fb0 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 13 一月 2025 15:01:31 +0800
Subject: [PATCH] 解决冲突

---
 Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj b/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj
index fed8923..b855f50 100644
--- a/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj
+++ b/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj
@@ -7,7 +7,7 @@
 		<RootNamespace>Yw</RootNamespace>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>3.0.6</Version>
+		<Version>3.1.2</Version>
 		<Description>寮曠敤鍗囩骇</Description>
 	</PropertyGroup>
 
@@ -27,11 +27,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.5" />
-	  <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.5" />
-	  <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
+	  <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.1.1" />
+	  <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.1.1" />
+	  <PackageReference Include="Yw.DALFactory.Core" Version="3.0.5" />
 	  <PackageReference Include="Yw.DynamicExpresso.Core" Version="3.0.0" />
-	  <PackageReference Include="Yw.Service.Core" Version="3.0.2" />
+	  <PackageReference Include="Yw.Service.Core" Version="3.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>

--
Gitblit v1.9.3