解决冲突

lixiaojun

2025-01-13 abf3ceabdd98abd0d955b03732e581a43c4e9fb0

 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.7</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>