From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs
index 4a60fc4..f6155d0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs
@@ -8,7 +8,7 @@
{
}
- public EquipmentViewModel(Vmo.AssetsKitPumpMappingVmo rhs, Vmo.AssetsPumpMainVmo pump, long kitID)
+ public EquipmentViewModel(Vmo.AssetsPackagePumpMappingVmo rhs, Vmo.AssetsPumpMainVmo pump, long kitID)
{
this.ID = rhs.ID;
this.KitID = kitID;
@@ -23,7 +23,7 @@
this.RatedSpeed = pump.RatedSpeed;
}
- public void Reset(Vmo.AssetsKitPumpMappingVmo rhs, Vmo.AssetsPumpMainVmo pump, long kitID)
+ public void Reset(Vmo.AssetsPackagePumpMappingVmo rhs, Vmo.AssetsPumpMainVmo pump, long kitID)
{
this.ID = rhs.ID;
--
Gitblit v1.9.3