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/00-/PumpChartEquivEffViewModel.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-/PumpChartEquivEffViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-/PumpChartEquivEffViewModel.cs
index 3678496..8d584fd 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-/PumpChartEquivEffViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-/PumpChartEquivEffViewModel.cs
@@ -11,7 +11,7 @@
this.Id = rhs.Id;
this.CurveName = rhs.CurveName;
this.Color = rhs.Color;
- this.CurveEquivEff = rhs.CurveEquivEff;
+ this.CurveEquivEff = rhs.CurveEquivEff;
}
--
Gitblit v1.9.3