From 651d1f87d2e0e26021c20f3667e1db7b1349b478 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:27:44 +0800
Subject: [PATCH] 冲突缺少文件补充
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs
index f22b382..fa0bdeb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs
@@ -2,14 +2,14 @@
{
public class PumpMainCurveChoieViewModel
{
- public PumpMainCurveChoieViewModel(Vmo.PumpSeries rhs)
+ public PumpMainCurveChoieViewModel(Vmo.PumpSeriesVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
this.IsPump = false;
}
- public PumpMainCurveChoieViewModel(Vmo.PumpGroup rhs)
+ public PumpMainCurveChoieViewModel(Vmo.PumpGroupVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -17,7 +17,7 @@
this.IsPump = false;
}
- public PumpMainCurveChoieViewModel(Vmo.PumpMain rhs, long GroupID)
+ public PumpMainCurveChoieViewModel(Vmo.PumpMainVmo rhs, long GroupID)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -25,7 +25,7 @@
this.IsPump = true;
}
- public PumpMainCurveChoieViewModel(Vmo.PumpMain rhs)
+ public PumpMainCurveChoieViewModel(Vmo.PumpMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -89,7 +89,7 @@
/// <summary>
/// 棰濆畾鏁堢巼
/// </summary>
- public double RatedEfficiency { get; set; }
+ public double? RatedEfficiency { get; set; }
/// <summary>
/// 棰濆畾鍔熺巼
--
Gitblit v1.9.3