From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
index 4a065ce..448c805 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
@@ -21,11 +21,8 @@
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MinorLoss = rhs.MinorLoss;
this.Caliber = rhs.Caliber;
- this.Manning = rhs.Manning;
this.Hazen = rhs.Hazen;
- this.Darcy = rhs.Darcy;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -42,12 +39,9 @@
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MinorLoss = rhs.MinorLoss;
this.Material = rhs.Material;
this.Caliber = rhs.Caliber;
- this.Manning = rhs.Manning;
this.Hazen = rhs.Hazen;
- this.Darcy = rhs.Darcy;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -68,9 +62,9 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
- [Display(Name = "鍚嶇О")]
+ [Display(Name = "鍨嬪彿")]
public string Name { get; set; }
/// <summary>
@@ -86,28 +80,10 @@
public string Material { get; set; }
/// <summary>
- /// 鍠峰皠绯绘暟
- /// </summary>
- [Display(Name = "灞�闃荤郴鏁�")]
- public double MinorLoss { get; set; }
-
- /// <summary>
///Hazen
/// </summary>
- [Display(Name = "濞佸粔濮嗘柉")]
+ [Display(Name = "灞�闃荤郴鏁�")]
public double Hazen { get; set; }
-
- /// <summary>
- ///Darcy
- /// </summary>
- [Display(Name = "杈捐タ")]
- public double? Darcy { get; set; }
-
- /// <summary>
- ///Manning
- /// </summary>
- [Display(Name = "鏇煎畞")]
- public double? Manning { get; set; }
/// <summary>
/// 鍏抽敭瀛�
--
Gitblit v1.9.3