From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
index 641d3fd..921493f 100644
--- a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
+++ b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/PhartGraphExtensions.cs
@@ -119,7 +119,7 @@
/// <summary>
/// 鑾峰彇鐗规�ф洸绾�
/// </summary>
- public static Yw.Pump.PerformCurveBase GetPerformCurve(this Yw.Model.PhartGraph rhs)
+ public static Yw.Ahart.PerformCurveBase GetPerformCurve(this Yw.Model.PhartGraph rhs)
{
if (rhs == null)
{
@@ -128,12 +128,12 @@
var key = $"{rhs.ID}:perform-curve";
return MemoryCacheHelper.GetSet(key, () =>
{
- Yw.Pump.PerformCurveBase performCurve = null;
+ Yw.Ahart.PerformCurveBase performCurve = null;
switch ((eGeometryStyle)rhs.GeometryStyle)
{
case eGeometryStyle.FeatCurve:
{
- performCurve = Yw.Pump.PerformCurveHelper.ToModel(rhs.GeometryInfo);
+ performCurve = Yw.Ahart.PerformCurveHelper.ToModel(rhs.GeometryInfo);
}
break;
default: break;
--
Gitblit v1.9.3