冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpSerialParallelChartDlg.cs

@@ -34,11 +34,9 @@
            };
        }

        private string _serial_parallel_id= "serial_parallel";
        private string _serial_parallel_id = "serial_parallel";
        private Yw.Geometry.Point2d _design_pt;
        private bool _is_parallel;



        /// <summary>
        /// 设置
@@ -164,7 +162,7 @@
            vm_sp.QpCalc = vm_sp.Qp;
            vm_sp.Color = Color.Black;
            vm_sp.IsBp = true;
            vm_sp.IsSerialParallel = true;
            vm_sp.IsDefault = true;
            return vm_sp;
        }