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

duheng

2024-12-04 935a8a4996853c51188402c57f905ee9c9eac898

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs

@@ -235,10 +235,10 @@
            }

            feedBackMsg?.Invoke("正在进行产品匹配...", Color.Black);
            var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo, null);
            var matchingParas = Yw.WinFrmUI.HydroMatchingHelper.Create(hydroInfo);
            if (AssetsMatchingHelper.Matching(matchingParas, out string error))
            {
                if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
                if (Yw.WinFrmUI.HydroMatchingHelper.Apply(hydroInfo, matchingParas))
                {
                    feedBackMsg?.Invoke("产品匹配完成。。。", Color.Green);
                }