From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
index a8a02d9..f8910bc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
@@ -13,7 +13,7 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
- this.ParentID = rhs.PumpSeriesID;
+ this.ParentID = rhs.SeriesID;
this.IsPump = false;
}
@@ -29,7 +29,7 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
- this.ParentID = rhs.PumpSeriesID;
+ this.ParentID = rhs.SeriesID;
this.IsPump = true;
this.Erosion = rhs.Erosion;
this.RatedPower = rhs.RatedPower;
--
Gitblit v1.9.3