From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-threelinksinglematching/FourLinkSingleMatchingViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-threelinksinglematching/FourLinkSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-threelinksinglematching/FourLinkSingleMatchingViewModel.cs
index ae467e5..27666b2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-threelinksinglematching/FourLinkSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-threelinksinglematching/FourLinkSingleMatchingViewModel.cs
@@ -10,9 +10,9 @@
{
this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
- this.Material = rhs.MaterialName;
+ this.Material = rhs.Material;
this.ModelType = rhs.Name;
- this.MinorLoss = rhs.Coefficient;
+ this.MinorLoss = rhs.MinorLoss;
}
/// <summary>
--
Gitblit v1.9.3