From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/01-tank/HydroTankMatchingViewModel.cs | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/01-tank/HydroTankMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/01-tank/HydroTankMatchingViewModel.cs
index bd7a5b6..6b63a55 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/01-tank/HydroTankMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/01-tank/HydroTankMatchingViewModel.cs
@@ -15,7 +15,6 @@
/// </summary>
public HydroTankMatchingViewModel(Yw.Model.HydroTankInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
{
- this.ID = rhs.ID;
this.Name = rhs.Name;
this.Code = rhs.Code;
this.ModelType = rhs.ModelType;
@@ -34,10 +33,6 @@
/// </summary>
public HydroTankMatchingViewModel(HydroTankViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
/// <summary>
/// 缂栫爜
@@ -65,27 +60,27 @@
public string DbId { get; set; }
/// <summary>
- /// CurveDbId
+ /// 鏇茬嚎DbId
/// </summary>
public string CurveDbId { get; set; }
/// <summary>
- /// 鏈�浣庢按浣�
+ /// 鏈�浣庢按浣�(m)
/// </summary>
public double MinLevel { get; set; }
/// <summary>
- /// 鏈�楂樻按浣�
+ /// 鏈�楂樻按浣�(m)
/// </summary>
public double MaxLevel { get; set; }
/// <summary>
- /// 鍏О鐩村緞
+ /// 鍏О鐩村緞(m)
/// </summary>
public double DN { get; set; }
/// <summary>
- /// 鏈�灏忓绉�
+ /// 鏈�灏忓绉�(m鲁)
/// </summary>
public double MinVol { get; set; }
@@ -138,5 +133,7 @@
/// 鍖归厤瀹圭Н鏇茬嚎
/// </summary>
public List<HydroCurvePointViewModel> MatchingVolCurve { get; set; }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3