From bc0ed5b6cfda6c72c06f451b77da8518c41ab210 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/06-meter/HydroMeterMatchingViewModel.cs | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/06-meter/HydroMeterMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/06-meter/HydroMeterMatchingViewModel.cs
index 51a7142..cfa9169 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/06-meter/HydroMeterMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/06-meter/HydroMeterMatchingViewModel.cs
@@ -15,7 +15,6 @@
/// </summary>
public HydroMeterMatchingViewModel(Yw.Model.HydroMeterInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
{
- this.ID = rhs.ID;
this.Name = rhs.Name;
this.Code = rhs.Code;
this.DbLocked = rhs.DbLocked;
@@ -27,23 +26,7 @@
/// <summary>
///
/// </summary>
- public HydroMeterMatchingViewModel(Yw.Model.HydroMeterInfo rhs, Yw.Model.HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult) : this(rhs, hydroInfo)
- {
-
- }
-
- /// <summary>
- ///
- /// </summary>
- public HydroMeterMatchingViewModel(HydroMeterViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo)
- {
-
- }
-
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
+ public HydroMeterMatchingViewModel(HydroMeterViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
/// <summary>
/// 缂栫爜
@@ -73,7 +56,7 @@
/// <summary>
/// 鎹熷け绯绘暟
/// </summary>
- public double? MinorLoss { get; set; }
+ public double MinorLoss { get; set; }
/// <summary>
/// 鍖归厤鍨嬪彿
--
Gitblit v1.9.3