Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-09-26 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs

@@ -36,7 +36,7 @@
                return null;
            foreach (var item in pumpMatchingViewModel)
            {
                var result = await AsstesAutoMatchingHelper.PumpMatching(item, pumpMainVmos);
                var result = await AssetsMatchingHelper.MatchingPumps(item, pumpMainVmos);
                if (result != null)
                {
                    finishList.Add(result);