From 57051b41eb245cd3dc68ed9167f492df5de9d04c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:59 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
index 89ffe1b..28064aa 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
@@ -81,13 +81,23 @@
[DisplayUnit("r/min")]
public double? RatedN { get; set; }
+ /// <summary>
+ /// 鎬ц兘鏇茬嚎
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("鎬ц兘鏇茬嚎")]
+ [PropertyOrder(106)]
+ [IsHydroCurvePro(HydroCurve.Pump)]
+ [Browsable(true)]
+ public string Curve { get; set; }
+
/// <summary>
/// 娴侀噺鎵▼鏇茬嚎
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鎵▼鏇茬嚎")]
- [PropertyOrder(105)]
+ [PropertyOrder(106)]
[IsHydroCurvePro(HydroCurve.PumpQH)]
[Browsable(true)]
public string CurveQH { get; set; }
@@ -97,7 +107,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鍔熺巼鏇茬嚎")]
- [PropertyOrder(106)]
+ [PropertyOrder(107)]
[IsHydroCurvePro(HydroCurve.PumpQP)]
[Browsable(true)]
public string CurveQP { get; set; }
@@ -107,7 +117,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鏁堢巼鏇茬嚎")]
- [PropertyOrder(107)]
+ [PropertyOrder(108)]
[IsHydroCurvePro(HydroCurve.PumpQE)]
[Browsable(true)]
public string CurveQE { get; set; }
@@ -117,7 +127,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("杞�熸瘮")]
- [PropertyOrder(108)]
+ [PropertyOrder(109)]
[Browsable(true)]
public double? SpeedRatio { get; set; }
@@ -126,7 +136,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("杞�熸瘮妯″紡")]
- [PropertyOrder(109)]
+ [PropertyOrder(110)]
[Browsable(true)]
public string SpeedRatioPattern { get; set; }
@@ -135,7 +145,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鑳借�椾环鏍�")]
- [PropertyOrder(110)]
+ [PropertyOrder(111)]
[Browsable(true)]
public double? Price { get; set; }
@@ -144,7 +154,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("浠锋牸妯″紡")]
- [PropertyOrder(111)]
+ [PropertyOrder(112)]
[Browsable(true)]
public string PricePattern { get; set; }
--
Gitblit v1.9.3