From f4280298af8d862679a7940676404e231140fc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 6 Jan 2023 12:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90getlistinpu?=
 =?UTF-8?q?t=E6=A8=A1=E6=9D=BF=EF=BC=8C=E8=81=94=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/SwaggerDoc.xml                     |  10 +++++-----
 .../Controllers/ERP/MaterialController.cs     |   2 +-
 .../ERP/PurchaseDetailsController.cs          |   2 +-
 .../Controllers/ERP/SupplierController.cs     |   4 ++--
 .../Controllers/ERP/UnitController.cs         |   2 +-
 .../Controllers/ERP/WarehouseController.cs    |   2 +-
 .../Temp/202301061154333382T_DataExport.xlsx  | Bin 0 -> 4623 bytes
 .../yi-sqlsugar-dev.db                        | Bin 286720 -> 286720 bytes
 .../ERP/IMaterialService.cs                   |   2 +-
 .../ERP/IPurchaseDetailsService.cs            |   2 +-
 .../ERP/ISupplierService.cs                   |   4 ++--
 .../ERP/IUnitService.cs                       |   2 +-
 .../ERP/IWarehouseService.cs                  |   2 +-
 .../ERP/MaterialService.cs                    |   2 +-
 .../ERP/PurchaseDetailsService.cs             |   5 ++---
 .../ERP/SupplierService.cs                    |   4 ++--
 .../Yi.Framework.Service/ERP/UnitService.cs   |   2 +-
 .../ERP/WarehouseService.cs                   |   2 +-
 .../Yi.Framework.Template/Program.cs          |  16 ++++++++--------
 .../Template/Server/ControllerTemplate.txt    |   2 +-
 .../Template/Server/IServiceTemplate.txt      |   2 +-
 .../Template/Server/ServiceTemplate.txt       |   2 +-
 22 files changed, 35 insertions(+), 36 deletions(-)
 create mode 100644 Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 7024d905..5dcfb119 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -181,7 +181,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.MaterialController.PageList(Yi.Framework.DtoModel.ERP.Material.MaterialCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.MaterialController.PageList(Yi.Framework.DtoModel.ERP.Material.MaterialGetListInput,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             分页查
             </summary>
@@ -249,7 +249,7 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.PageList(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.PageList(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsGetListInput,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             分页查
             </summary>
@@ -283,7 +283,7 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.SupplierController.PageList(Yi.Framework.DtoModel.ERP.Supplier.SupplierCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.SupplierController.PageList(Yi.Framework.DtoModel.ERP.Supplier.SupplierGetListInput,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             分页查
             </summary>
@@ -317,7 +317,7 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.UnitController.PageList(Yi.Framework.DtoModel.ERP.Unit.UnitCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.UnitController.PageList(Yi.Framework.DtoModel.ERP.Unit.UnitGetListInput,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             分页查
             </summary>
@@ -357,7 +357,7 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.WarehouseController.PageList(Yi.Framework.DtoModel.ERP.Warehouse.WarehouseCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.WarehouseController.PageList(Yi.Framework.DtoModel.ERP.Warehouse.WarehouseGetListInput,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             分页查
             </summary>
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs
index c1ca9d68..28b59a1f 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] MaterialCreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] MaterialGetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _materialService.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
index b1b5dd45..f8c9dafd 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] PurchaseDetailsCreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] PurchaseDetailsGetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _purchaseDetailsService.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs
index 1a10baf5..a0a9481f 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Yi.Framework.Common.Models;
 using Yi.Framework.DtoModel.ERP.Supplier;
 using Yi.Framework.Interface.ERP;
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] SupplierCreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] SupplierGetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _supplierService.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs
index c8180bab..adae2cda 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] UnitCreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] UnitGetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _unitService.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs
index 56cd4964..ff3d630e 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] WarehouseCreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] WarehouseGetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _warehouseService.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..58d4293f2de0031a8988d6e155883719d0bb60f6
GIT binary patch
literal 4623
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

literal 0
HcmV?d00001

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 548aad63e31684c2392868af1aa03b74e93a8cd9..2256c9276ca260b0c2068282d61fa1a90097b0af 100644
GIT binary patch
delta 174
zcmZoTAlPs~aDp_W`a~ILM)k&otqF`v@_AVJLKyg`@@w(!=L^{^DB!{;k;x*!Ca5ki
zuBgr6%m4x$VlmqP(w(NSt!H#mGqN%;ure{xGc&WaFfumGWX4pi)o3-{v7XVL*VM$y
z&_vJ3)YQnr)N;C3J>#wIEDspZ^NWCt6JTKBVP<0#ivcQc5@29%f8Ngs#7x_t_cKdg
F008WlD>wiE

delta 61
zcmZoTAlPs~aDp_W>O>i5M%BiItqF`v@;R9JwHWxP@@s7t6p-Veu2s)?Ydebq(@XyL
QxBZMj%(VS&KeO-!08G^s#{d8T

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs
index db55544e..44d8a0b9 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
 {
     public interface IMaterialService : ICrudAppService<MaterialGetListOutput, long, MaterialCreateUpdateInput>
     {
-        Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialGetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
index d0ef37a7..981fddfc 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
 {
     public interface IPurchaseDetailsService : ICrudAppService<PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>
     {
-        Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs
index a9a62ebd..e1b02e0d 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
 {
     public interface ISupplierService : ICrudAppService<SupplierGetListOutput, long, SupplierCreateUpdateInput>
     {
-        Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierGetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs
index 5293cef4..3d001d42 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
 {
     public interface IUnitService : ICrudAppService<UnitGetListOutput, long, UnitCreateUpdateInput>
     {
-        Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitCreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitGetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs
index 95365e6b..d2a51284 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
 {
     public interface IWarehouseService : ICrudAppService<WarehouseGetListOutput, long, WarehouseCreateUpdateInput>
     {
-        Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseGetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs
index b98b8dad..22a40fc2 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs
@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
 {
     public class MaterialService : CrudAppService<MaterialEntity, MaterialGetListOutput, long, MaterialCreateUpdateInput>, IMaterialService
     {
-        public async Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
index ee51382b..3cd9d361 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
@@ -16,12 +16,11 @@ namespace Yi.Framework.Service.ERP
 {
     public class PurchaseDetailsService : CrudAppService<PurchaseDetailsEntity, PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>, IPurchaseDetailsService
     {
-        public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable
-                //.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code))
-                //.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name))
+
                 .ToPageListAsync(page.PageNum, page.PageSize, totalNumber);
             return new PageModel<List<PurchaseDetailsGetListOutput>> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) };
         }
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs
index d39a73cc..d746c9cb 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs
@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
 {
     public class SupplierService : CrudAppService<SupplierEntity, SupplierGetListOutput, long, SupplierCreateUpdateInput>, ISupplierService
     {
-        public async Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs
index 188d0e9d..01ff04ee 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs
@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
 {
     public class UnitService : CrudAppService<UnitEntity, UnitGetListOutput, long, UnitCreateUpdateInput>, IUnitService
     {
-        public async Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitCreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs
index 75486731..5092258e 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs
@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
 {
     public class WarehouseService : CrudAppService<WarehouseEntity, WarehouseGetListOutput, long, WarehouseCreateUpdateInput>, IWarehouseService
     {
-        public async Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Program.cs b/Yi.Framework.Net6/Yi.Framework.Template/Program.cs
index 156ae451..0006e0ca 100644
--- a/Yi.Framework.Net6/Yi.Framework.Template/Program.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Template/Program.cs
@@ -13,15 +13,15 @@ foreach (var entityName in entityNames)
 {
     templateFactory.CreateTemplateProviders((option) =>
     {
-        option.Add(new ServceTemplateProvider(modelName, entityName));
-        option.Add(new IServceTemplateProvider(modelName, entityName));
-        option.Add(new CreateUpdateInputTemplateProvider(modelName, entityName));
-        option.Add(new GetListOutputTemplateProvider(modelName, entityName));
-        option.Add(new GetListInputTemplateProvider(modelName, entityName));
-        option.Add(new ConstTemplateProvider(modelName, entityName));
-        option.Add(new ProfileTemplateProvider(modelName, entityName));
+        //option.Add(new ServceTemplateProvider(modelName, entityName));
+        //option.Add(new IServceTemplateProvider(modelName, entityName));
+        //option.Add(new CreateUpdateInputTemplateProvider(modelName, entityName));
+        //option.Add(new GetListOutputTemplateProvider(modelName, entityName));
+        //option.Add(new GetListInputTemplateProvider(modelName, entityName));
+        //option.Add(new ConstTemplateProvider(modelName, entityName));
+        //option.Add(new ProfileTemplateProvider(modelName, entityName));
         option.Add(new ControllerTemplateProvider(modelName, entityName));
-        option.Add(new ApiTemplateProvider(modelName, entityName));
+        //option.Add(new ApiTemplateProvider(modelName, entityName));
     });
     //开始构建模板
     templateFactory.BuildTemplate();
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt
index 2951131e..b68e30c7 100644
--- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt
+++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt
@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.#ModelName#
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList([FromQuery] #EntityName#CreateUpdateInput input, [FromQuery] PageParModel page)
+        public async Task<Result> PageList([FromQuery] #EntityName#GetListInput input, [FromQuery] PageParModel page)
         {
             var result = await _#LowerEntityName#Service.PageListAsync(input, page);
             return Result.Success().SetData(result);
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt
index b1f20b7a..0e73fa41 100644
--- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt
+++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt
@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.#ModelName#
 {
     public interface I#EntityName#Service : ICrudAppService<#EntityName#GetListOutput, long, #EntityName#CreateUpdateInput>
     {
-        Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page);
+        Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#GetListInput input, PageParModel page);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt
index 1a669210..078f4fcf 100644
--- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt
+++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt
@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.#ModelName#
 {
     public class #EntityName#Service : CrudAppService<#EntityName#Entity, #EntityName#GetListOutput, long, #EntityName#CreateUpdateInput>, I#EntityName#Service
     {
-        public async Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page)
+        public async Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#GetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
             var data = await Repository._DbQueryable