解决包冲突

src/BPA.SaaS.Material.Api.Bootstrap/BPA.SaaS.Material.Api.Bootstrap.csproj

@@ -11,9 +11,9 @@
         <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.3" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
         <PackageReference Include="BPA.Component.CAP.RabbitMQ" Version="1.0.2" />
-        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
         <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
-        <PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.17" />
+        <PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.21" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />

src/BPA.SaaS.Material.Api.DTO/BPA.SaaS.Material.Api.DTO.csproj

@@ -8,7 +8,7 @@
     <PackageReleaseNotes />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+    <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
     <PackageReference Include="Nuget.Tools.V2" Version="1.1.7" />
   </ItemGroup>
 </Project>

src/BPA.SaaS.Material.Api.DTO/UnitDtoQuery.cs

@@ -1,6 +1,8 @@
-namespace BPA.SaaS.Material.Api.DTO
+using BPA.Component.DTOCommon;
+
+namespace BPA.SaaS.Material.Api.DTO
 {
-    public class UnitDtoQuery
+    public class UnitDtoQuery : PageInputBase
     {
         /// <summary>
         /// TypeID

src/BPA.SaaS.Material.Api.Entity/BPA.SaaS.Material.Api.Entity.csproj

@@ -6,7 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="BPA.Common.Entity" Version="1.0.3" />
-        <PackageReference Include="BPA.Common.Enums" Version="1.0.6" />
+        <PackageReference Include="BPA.Common.Entity" Version="1.0.5" />
+        <PackageReference Include="BPA.Common.Enums" Version="1.0.3" />
     </ItemGroup>
 </Project>

src/BPA.SaaS.Material.Api.Model/BPA.SaaS.Material.Api.Model.csproj

@@ -13,7 +13,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="BPA.Component.ApolloClient" Version="1.0.9" />
-        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
         <PackageReference Include="BPA.Component.LogClient" Version="1.0.3" />
         <PackageReference Include="BPA.Component.MongoClient" Version="1.0.3" />
         <PackageReference Include="BPA.Component.RabbitMQClient" Version="1.0.7" />

src/BPA.SaaS.Material.Api.Repository/BPA.SaaS.Material.Api.Repository.csproj

@@ -6,11 +6,10 @@
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="BPA.Common.Eums" Version="1.0.7" />
-        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
         <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
         <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
-        <PackageReference Include="BPA.Common.Entity" Version="1.0.3" />
+        <PackageReference Include="BPA.Common.Entity" Version="1.0.5" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />

src/BPA.SaaS.Material.Api.SDK/BPA.SaaS.Material.Api.SDK.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="BPA.SaaS.Material.Api.DTO" Version="1.0.1" />
-        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+        <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
         <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
         <PackageReference Include="Nuget.Tools.V2" Version="1.1.7" />
     </ItemGroup>

src/BPA.SaaS.Material.Api.Service/BPA.SaaS.Material.Api.Service.csproj

@@ -6,10 +6,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.8" />
+    <PackageReference Include="BPA.Component.DTOCommon" Version="1.0.11" />
     <PackageReference Include="BPA.Component.Extensions" Version="1.0.4" />
     <PackageReference Include="BPA.Component.SDKCommon" Version="1.0.3" />
-    <PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.17" />
+    <PackageReference Include="BPA.Component.WebApiExtensions" Version="1.0.21" />
     
     <ProjectReference Include="..\BPA.SaaS.Material.Api.DTO\BPA.SaaS.Material.Api.DTO.csproj" />
     <ProjectReference Include="..\BPA.SaaS.Material.Api.Model\BPA.SaaS.Material.Api.Model.csproj" />

src/BPA.SaaS.Material.Api.WebApi/BPA.SaaS.Material.Api.WebApi.csproj

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <ProjectReference Include="..\BPA.SaaS.Material.Api.IService\BPA.SaaS.Material.Api.IService.csproj" />
-    <ProjectReference Include="..\BPA.SaaS.Material.Api.Bootstrap\BPA.SaaS.Material.Api.Bootstrap.csproj" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0"/>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\BPA.SaaS.Material.Api.IService\BPA.SaaS.Material.Api.IService.csproj"/>
+        <ProjectReference Include="..\BPA.SaaS.Material.Api.Bootstrap\BPA.SaaS.Material.Api.Bootstrap.csproj"/>
+    </ItemGroup>
 </Project>

src/BPA.SaaS.Material.Api.WebApi/Program.cs

@@ -1,7 +1,7 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using BPA.Component.WebApiExtensions.Extensions;
- using BPA.SaaS.Material.Api.Bootstrap;
+using BPA.SaaS.Material.Api.Bootstrap;
 using Microsoft.AspNetCore.Mvc;
 
 var builder = WebApplication.CreateBuilder(args);