From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.cs
index c28d9b9..473537f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/XhsPumpMatchingListCtrl.cs
@@ -36,7 +36,7 @@
foreach (var item in pumpMatchingViewModel)
{
- await AssetsMatchingHelper.MatchingPumps(item, AssetsPumpMainVmos);
+ AssetsMatchingHelper.MatchingPumps(item, AssetsPumpMainVmos);
}
_allBindingList.Clear();
foreach (var item in pumpMatchingViewModel)
--
Gitblit v1.9.3