From f97b3ccbfd63b62ec875223fcc417633f6ce2989 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 09 十二月 2024 17:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
index c2a7212..96c9ed3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
@@ -75,10 +75,10 @@
             {
                 _pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
                 _pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
-                /*  _pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
-                 _pumpMatchingViewModel.MatchingMaterial = vm.Material;
-                 _pumpMatchingViewModel.MatchingExchangerType = (eExchangerType?)vm.SeriesType;
-                 _pumpMatchingViewModel.MatchingExchangerSetting = vm.ExchangerSetting;*/
+                /*  _valveMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
+                 _valveMatchingViewModel.MatchingMaterial = vm.Material;
+                 _valveMatchingViewModel.MatchingExchangerType = (eExchangerType?)vm.SeriesType;
+                 _valveMatchingViewModel.MatchingExchangerSetting = vm.ExchangerSetting;*/
                 var list = await _bll_ex.Value.GetByMainID(vm.ID);
                 if (list != null && list.Any())
                 {

--
Gitblit v1.9.3