冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpPictureBoxCtrl.cs

@@ -70,12 +70,12 @@
        /// <summary>
        /// 捕捉曲线类型
        /// </summary>
        private Yw.Pump.eCurveType _currentCaptureCruve = Yw.Pump.eCurveType.QH;
        private Yw.Ahart.eCurveType _currentCaptureCruve = Yw.Ahart.eCurveType.QH;

        /// <summary>
        /// 当前捕捉曲线类型
        /// </summary>
        public Yw.Pump.eCurveType CurrentCaptureCruve
        public Yw.Ahart.eCurveType CurrentCaptureCruve
        {
            get => _currentCaptureCruve;
            set => _currentCaptureCruve = value;