From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/02-pump/HydroCalcuPumpResult.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/01-pump/HydroCalcuPumpResult.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/02-pump/HydroCalcuPumpResult.cs
similarity index 83%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/01-pump/HydroCalcuPumpResult.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/02-pump/HydroCalcuPumpResult.cs
index 448cb8a..1440662 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/01-pump/HydroCalcuPumpResult.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/04-link/02-pump/HydroCalcuPumpResult.cs
@@ -41,6 +41,8 @@
public HydroCalcuPumpResult(IHydroCalcuPumpResult rhs) : base(rhs)
{
this.CalcuQ = rhs.CalcuQ;
+ this.CalcuPr1 = rhs.CalcuPr1;
+ this.CalcuPr2 = rhs.CalcuPr2;
this.CalcuH = rhs.CalcuH;
this.CalcuP = rhs.CalcuP;
this.CalcuE = rhs.CalcuE;
@@ -52,6 +54,8 @@
public HydroCalcuPumpResult(HydroCalcuPumpResult rhs) : base(rhs)
{
this.CalcuQ = rhs.CalcuQ;
+ this.CalcuPr1 = rhs.CalcuPr1;
+ this.CalcuPr2 = rhs.CalcuPr2;
this.CalcuH = rhs.CalcuH;
this.CalcuP = rhs.CalcuP;
this.CalcuE = rhs.CalcuE;
@@ -63,6 +67,16 @@
public double? CalcuQ { get; set; }
/// <summary>
+ /// 杩涘彛鍘嬪姏(m)
+ /// </summary>
+ public double? CalcuPr1 { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍘嬪姏(m)
+ /// </summary>
+ public double? CalcuPr2 { get; set; }
+
+ /// <summary>
/// 鎵▼锛坢锛�
/// </summary>
public double? CalcuH { get; set; }
--
Gitblit v1.9.3