From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 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 e5aa140..1ca9e59 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
@@ -6,7 +6,7 @@
         {
         }
 
-        public CurrentPartMainViewModel(Vmo.PumpPartMainVmo rhs) : base()
+        public CurrentPartMainViewModel(Vmo.AssetsPumpPartMainVmo rhs) : base()
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
@@ -15,7 +15,7 @@
             this.SeriesID = rhs.SeriesID;
         }
 
-        public void Reset(Vmo.PumpPartMainVmo rhs)
+        public void Reset(Vmo.AssetsPumpPartMainVmo rhs)
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;

--
Gitblit v1.9.3