From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
index 1ca9e59..6577a8e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
@@ -9,6 +9,7 @@
public CurrentPartMainViewModel(Vmo.AssetsPumpPartMainVmo rhs) : base()
{
this.ID = rhs.ID;
+ this.PartID=rhs.PartID;
this.Name = rhs.Name;
this.NO = rhs.NO;
this.Code = rhs.Code;
@@ -21,6 +22,7 @@
this.Name = rhs.Name;
this.NO = rhs.NO;
this.Code = rhs.Code;
+ this.PartID = rhs.PartID;
this.SeriesID = rhs.SeriesID;
}
@@ -29,6 +31,11 @@
/// </summary>
public long ID { get; set; }
+
+ /// <summary>
+ /// 娉佃澶嘔D
+ /// </summary>
+ public long PartID { get; set; }
/// <summary>
/// 娉电郴鍒桰D
/// </summary>
--
Gitblit v1.9.3