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/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.cs
index d8c81b7..ee7e5f2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.cs
@@ -29,7 +29,7 @@
             }
         }
 
-        public List<ElbowMatchingViewModel> SetMatching(List<ElbowMatchingViewModel> inputs, List<ElbowMainVmo> alllist)
+        public List<ElbowMatchingViewModel> SetMatching(List<ElbowMatchingViewModel> inputs, List<AssetsElbowMainVmo> alllist)
         {
             if (inputs == null || inputs.Count == 0)
                 return null;

--
Gitblit v1.9.3