冲突

Shuxia Ning

2024-11-09 4999c3c3884084c10c8a4bb2426e92cb63600166

 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<FourLinkMainVmo> alllist)
        public List<FourlinkMatchingViewModel> SetMatching(List<FourlinkMatchingViewModel> inputs, List<AssetsFourlinkMainVmo> alllist)
        {
            if (inputs == null || inputs.Count == 0)
                return null;