From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs
index 2e8cbfa..e021a6d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs
@@ -29,7 +29,7 @@
}
}
- public List<FourlinkMatchingViewModel> SetMatching(List<FourlinkMatchingViewModel> inputs, List<AdaptingManageVmo> alllist)
+ public List<FourlinkMatchingViewModel> SetMatching(List<FourlinkMatchingViewModel> inputs, List<AssetsFourlinkMainVmo> alllist)
{
if (inputs == null || inputs.Count == 0)
return null;
--
Gitblit v1.9.3