冲突

duheng

2024-09-27 32b2fee0421e7997672fe4a14fe5bf9a6de926c2

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs

@@ -112,7 +112,7 @@
                        dlg.SetBindingData(input);
                        dlg.ReloadDataEvent += (rhs) =>
                        {
                            var bol = AssetsMatchingParasHelper.ApplyPump(hydroInfo, rhs);
                            var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
                            if (bol)
                            {
                                TipFormHelper.ShowSucceed("匹配成功");