From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +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/PumpMainViewModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PumpMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PumpMainViewModel.cs
index e9e1608..15d41bf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PumpMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PumpMainViewModel.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI.Xhs.PumpProduct
{
- public class PumpMainViewModel
+ public class AssetsPumpMainViewModel
{
- public PumpMainViewModel(Vmo.PumpMainVmo rhs) : base()
+ public AssetsPumpMainViewModel(Vmo.AssetsPumpMainVmo rhs) : base()
{
this.ID = rhs.ID;
this.PumpSeriesID = rhs.PumpSeriesID;
@@ -21,7 +21,7 @@
this.Model = rhs;
}
- /* public PumpMainViewModel(Vmo.PumpMainVmo rhs) : base()
+ /* public AssetsPumpMainViewModel(Vmo.AssetsPumpMainVmo rhs) : base()
{
this.PumpSeriesID = rhs.PumpSeriesID;
this.RatedPower = rhs.RatedPower;
@@ -37,7 +37,7 @@
this.Description = rhs.Description;
}*/
- public void Reset(Vmo.PumpMainVmo rhs)
+ public void Reset(Vmo.AssetsPumpMainVmo rhs)
{
this.ID = rhs.ID;
this.PumpSeriesID = rhs.PumpSeriesID;
@@ -129,6 +129,6 @@
/// </summary>
public string? Description { get; set; }
- public Vmo.PumpMainVmo Model { get; set; }
+ public Vmo.AssetsPumpMainVmo Model { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3