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/12-pipe/HydroPipeMatchingViewModel.cs | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/12-pipe/HydroPipeMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/12-pipe/HydroPipeMatchingViewModel.cs
index 4c89dad..730ac21 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/12-pipe/HydroPipeMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/12-pipe/HydroPipeMatchingViewModel.cs
@@ -8,14 +8,14 @@
/// <summary>
///
/// </summary>
- public HydroPipeMatchingViewModel() { }
+ public HydroPipeMatchingViewModel()
+ { }
/// <summary>
///
/// </summary>
public HydroPipeMatchingViewModel(Yw.Model.HydroPipeInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
{
- this.ID = rhs.ID;
this.Name = rhs.Name;
this.Code = rhs.Code;
this.DbLocked = rhs.DbLocked;
@@ -32,11 +32,6 @@
///
/// </summary>
public HydroPipeMatchingViewModel(HydroPipeViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
-
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
/// <summary>
/// 缂栫爜
@@ -117,7 +112,5 @@
/// 鍖归厤鎹熷け绯绘暟
/// </summary>
public double? MatchingMinorLoss { get; set; }
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3