冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/07-control/HydroLossCurveInteropCtrl.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/01-curve/HydroSingleWorkingLossCurveInteropCtrl.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class HydroSingleWorkingLossCurveInteropCtrl
    partial class HydroLossCurveInteropCtrl
    {
        /// <summary> 
        /// Required designer variable.
@@ -298,12 +298,12 @@
            emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // HydroSingleWorkingLossCurveInteropCtrl
            // HydroLossCurveInteropCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "HydroSingleWorkingLossCurveInteropCtrl";
            Name = "HydroLossCurveInteropCtrl";
            Size = new Size(993, 731);
            ((ISupportInitialize)lossBindingSource).EndInit();
            ((ISupportInitialize)elevBindingSource).EndInit();