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/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs
index 30016df..4bdac71 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI
{
public partial class ThreeLinkSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
{
@@ -8,16 +8,16 @@
}
private ThreelinkMatchingViewModel _pipeMatchingViewModel;
- private BLL.ThreeLinkMain _ThreeLinkBll;
+ private BLL.AssetsThreelinkMain _ThreeLinkBll;
private List<ThreeLinkSingleMatchingViewModel> _allBindingList;
public async void SetBindingData(ThreelinkMatchingViewModel PipeMatchingViewModel)
{
_pipeMatchingViewModel = PipeMatchingViewModel;
_allBindingList = new List<ThreeLinkSingleMatchingViewModel>();
- _ThreeLinkBll = new BLL.ThreeLinkMain();
- var allThreeLinkMain = await _ThreeLinkBll.GetAll();
- foreach (var Main in allThreeLinkMain)
+ _ThreeLinkBll = new BLL.AssetsThreelinkMain();
+ var allAssetsThreelinkMain = await _ThreeLinkBll.GetAll();
+ foreach (var Main in allAssetsThreelinkMain)
{
_allBindingList.Add(new ThreeLinkSingleMatchingViewModel(Main));
}
--
Gitblit v1.9.3