From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs
index a936c73..e245916 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs
@@ -31,7 +31,7 @@
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.Angle = rhs.Angle;
this.ElbowLengthType = rhs.ElbowLengthType;
this.MinorLoss = rhs.MinorLoss;
@@ -58,7 +58,7 @@
}
this.Description = rhs.Description;
this.Name = rhs.Name;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.SortCode = rhs.SortCode;
this.Angle = rhs.Angle;
this.ElbowLengthType = rhs.ElbowLengthType;
@@ -110,7 +110,7 @@
/// </summary>
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
- public List<string> KeyWord { get; set; }
+ public string KeyWord { get; set; }
/// <summary>
/// 寮ご绫诲瀷
--
Gitblit v1.9.3