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/03-coefficient/ThreelinkCoefficientViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-coefficient/ThreelinkCoefficientViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-coefficient/ThreelinkCoefficientViewModel.cs
index 867c904..2fe1f19 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-coefficient/ThreelinkCoefficientViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-coefficient/ThreelinkCoefficientViewModel.cs
@@ -7,7 +7,7 @@
public ThreelinkCoefficientViewModel()
{ }
- public ThreelinkCoefficientViewModel(Vmo.AssetsThreelinkCoefficientVmo rhs)
+ public ThreelinkCoefficientViewModel(Vmo.AssetsThreelinkFactorVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -59,7 +59,7 @@
/// <summary>
/// 鏀閫氳繃鎹熷け绯绘暟
/// </summary>
- [DisplayName("杩愯閫氳繃鎹熷け绯绘暟")]
+ [DisplayName("鏀閫氳繃鎹熷け绯绘暟")]
[Browsable(true)]
public double? BranchThroughMinorLoss { get; set; }
}
--
Gitblit v1.9.3