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.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
index 28cd017..295a6cb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
@@ -1,6 +1,6 @@
 锘縰sing HStation.WinFrmUI.PhartRelation;
 
-namespace HStation.WinFrmUI.Xhs
+namespace HStation.WinFrmUI
 {
     public partial class ValveSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
     {
@@ -27,7 +27,7 @@
 
         private List<ValveSingleMatchingViewModel> _allBindingList = null;
 
-        private BLL.PumpMain _pumpBll = null;
+        private BLL.AssetsPumpMain _pumpBll = null;
 
         private List<PhartViewModel> _allPhartList = null;
         private readonly Lazy<BLL.XhsPumpMainPhartMappingExtensions> _bll_ex = new();
@@ -38,9 +38,9 @@
         {
             _pumpMatchingViewModel = pumpMatchingViewModel;
             _allBindingList = new List<ValveSingleMatchingViewModel>();
-            _pumpBll = new BLL.PumpMain();
-            var allPumpMain = await _pumpBll.GetAll();
-            foreach (var Main in allPumpMain)
+            _pumpBll = new BLL.AssetsPumpMain();
+            var allAssetsPumpMain = await _pumpBll.GetAll();
+            foreach (var Main in allAssetsPumpMain)
             {
                 _allBindingList.Add(new ValveSingleMatchingViewModel(Main));
             }

--
Gitblit v1.9.3