From 9b673ca69c30616b5e5807d665ed8efa2720e1c8 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 17:57:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
index 918db9a..b16766b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
@@ -29,7 +29,7 @@
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
this.MinorLoss = rhs.MinorLoss;
@@ -57,7 +57,7 @@
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
this.MinorLoss = rhs.MinorLoss;
@@ -105,7 +105,7 @@
/// 绯绘暟
/// </summary>
- [DisplayName("绯绘暟")]
+ [DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
public double MinorLoss { get; set; }
--
Gitblit v1.9.3