From 473a612211acdfab40288e04a3d3343cff8c172b Mon Sep 17 00:00:00 2001 From: Jackson Date: Thu, 3 Oct 2024 20:10:15 +0800 Subject: [PATCH 1/2] . --- .../AppFunction/FrmOperation.cs | 12 ++++++------ topsky-hotel-manager-system-web-api | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs index c880598..4777137 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs @@ -59,10 +59,10 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); - this.btnPg.TotalCount = custos.total; + OSelectAllDto operationlog = HttpHelper.JsonToModel>(result.message); + this.btnPg.TotalCount = operationlog.total; this.dgvOperationlog.AutoGenerateColumns = false; - this.dgvOperationlog.DataSource = custos.listSource; + this.dgvOperationlog.DataSource = operationlog.listSource; } private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) @@ -78,10 +78,10 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); - this.btnPg.TotalCount = custos.total; + OSelectAllDto operationlog = HttpHelper.JsonToModel>(result.message); + this.btnPg.TotalCount = operationlog.total; this.dgvOperationlog.AutoGenerateColumns = false; - this.dgvOperationlog.DataSource = custos.listSource; + this.dgvOperationlog.DataSource = operationlog.listSource; } } } diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 203ab07..8e01c77 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 203ab072c0a4332aac48c5fbc46f0fb28009cdec +Subproject commit 8e01c77c0219e0c72642ffee976220c77ea223b0 -- Gitee From 3b3eddf23cd6defb4399ab61d17756769855b7ac Mon Sep 17 00:00:00 2001 From: Jackson Date: Thu, 3 Oct 2024 20:12:45 +0800 Subject: [PATCH 2/2] ref project --- EOM.Client.TopSkyHotelManagerSystem.sln | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index ca1d178..4ae2ce9 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -22,6 +22,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.FormUI", "EOM.TSHotelManager.FormUI\EOM.TSHotelManager.FormUI.csproj", "{D89E76F5-007B-4915-91A8-265CCA6814BF}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Shared", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Shared\EOM.TSHotelManager.Shared.csproj", "{1A37446C-A721-4507-89B5-7BFF6F66A004}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -60,6 +62,10 @@ Global {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.Build.0 = Release|Any CPU + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -73,6 +79,7 @@ Global {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {781CEE04-DDB4-4037-8175-9A6548716871} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} {D89E76F5-007B-4915-91A8-265CCA6814BF} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {1A37446C-A721-4507-89B5-7BFF6F66A004} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B93ABE6D-89AD-45B3-94FB-65BD98597CC6} -- Gitee