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/07-fourLink/01-series/AssetsFourlinkSeriesViewModel.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/ElbowSeriesViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AssetsFourlinkSeriesViewModel.cs
similarity index 81%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/ElbowSeriesViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AssetsFourlinkSeriesViewModel.cs
index 04eb3bc..2cbd065 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/ElbowSeriesViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AssetsFourlinkSeriesViewModel.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraRichEdit.Model.History;
+using Yw.Untity;
namespace HStation.WinFrmUI.Assets
{
@@ -12,6 +13,7 @@
{
this.Name = rhs.Name;
this.ID = rhs.ID;
+ this.ParentID = TreeParentIdsHelper.GetLastParentID(rhs.ParentIds);
this.Description = rhs.Description;
}
@@ -19,6 +21,7 @@
{
this.Name = rhs.Name;
this.ID = rhs.ID;
+ this.ParentID = TreeParentIdsHelper.GetLastParentID(rhs.ParentIds);
this.Description = rhs.Description;
}
--
Gitblit v1.9.3