From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpPictureBoxCtrl.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpPictureBoxCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpPictureBoxCtrl.cs
index d3e7eec..dcf6c77 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/02-picture/PumpPictureBoxCtrl.cs
+++ b/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;
--
Gitblit v1.9.3