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/03-one-point/PumpImportByOnePointCtrl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
index 497a26e..63922f3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
@@ -247,9 +247,9 @@
XtraMessageBox.Show("璇疯緭鍏ユ洸绾垮悕绉�!");
return false;
}
- qh = new Pump.CurveQH(Yw.Pump.eFeatType.Cubic, _qh_pt_list);
- qe = new Pump.CurveQE(Yw.Pump.eFeatType.Cubic, _qe_pt_list);
- qp = new Pump.CurveQP(Yw.Pump.eFeatType.Cubic, _qp_pt_list);
+ qh = new Pump.CurveQH(Yw.Ahart.eFeatType.Cubic, _qh_pt_list);
+ qe = new Pump.CurveQE(Yw.Ahart.eFeatType.Cubic, _qe_pt_list);
+ qp = new Pump.CurveQP(Yw.Ahart.eFeatType.Cubic, _qp_pt_list);
return true;
}
--
Gitblit v1.9.3