From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs
index 6639e02..319ccbd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs
@@ -21,7 +21,8 @@
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MinorLoss = rhs.MinorLoss;
+ this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
+ this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -40,7 +41,8 @@
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MinorLoss = rhs.MinorLoss;
+ this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
+ this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -63,9 +65,9 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
- [Display(Name = "鍚嶇О")]
+ [Display(Name = "鍨嬪彿")]
public string Name { get; set; }
/// <summary>
@@ -81,10 +83,16 @@
public string Material { get; set; }
/// <summary>
- /// 鍠峰皠绯绘暟
+ /// 涓荤閫氳繃鎹熷け绯绘暟
/// </summary>
- [Display(Name = "鍠峰皠绯绘暟")]
- public double MinorLoss { get; set; }
+ [Display(Name = "涓荤閫氳繃鎹熷け绯绘暟")]
+ public double? RunThroughMinorLoss { get; set; }
+
+ /// <summary>
+ /// 鏀閫氳繃鎹熷け绯绘暟
+ /// </summary>
+ [Display(Name = "鏀閫氳繃鎹熷け绯绘暟")]
+ public double? BranchThroughMinorLoss { get; set; }
/// <summary>
/// 鍏抽敭瀛�
--
Gitblit v1.9.3