From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期五, 20 九月 2024 15:35:59 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs index 78c3e6c..b256241 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs @@ -40,7 +40,7 @@ return; } _hydro = await new Yw.BLL.HydroModelInfo().GetByID(hydroRelation.ModelID); - this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydro); + // this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydro); } /// <summary> -- Gitblit v1.9.3