冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs

@@ -23,7 +23,7 @@
                return;
            }
            _input = input;
            this.assetsTankSingleMatchingCtrl1.SetBindingData(input.DbId);
            this.assetsTankSingleMatchingCtrl1.SetBindingData(input.DbId, input.CurveDbId);
        }

        private void GeneralOkAndCancelCtrl1_OkEvent()
@@ -37,7 +37,6 @@
            {
                return;
            }

            _input.MatchingModelType = vm.Vmo.Name;
            _input.MatchingCurveDbId = vm.MatchingCurveDbId;
            _input.MatchingMaxLevel = vm.Vmo.MaxLevel;