From facdda630bc2a16c2a61e5db6e4387e257202d44 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 11:40:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
index 4a86348..d8f6f14 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
@@ -2587,9 +2587,15 @@
/// <summary>
/// 搴旂敤
/// </summary>
- public static bool Apply(HydroPumpViewModel visualViewModel, HydroPumpMatchingViewModel matching)
+ public static bool Apply
+ (
+ HydroPumpViewModel visualViewModel,
+ HydroPumpMatchingViewModel matching,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
- var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+ var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
visualViewModel.UpdateProperty();
return bol;
}
--
Gitblit v1.9.3