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/02-model/99-models/02-geometry/FeatCurveGeometryParasModel.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Service/HStation.Service.PhartRelation.Core/02-model/99-models/02-geometry/FeatCurveGeometryParasModel.cs b/Service/HStation.Service.PhartRelation.Core/02-model/99-models/02-geometry/FeatCurveGeometryParasModel.cs
index 6beb652..0e46655 100644
--- a/Service/HStation.Service.PhartRelation.Core/02-model/99-models/02-geometry/FeatCurveGeometryParasModel.cs
+++ b/Service/HStation.Service.PhartRelation.Core/02-model/99-models/02-geometry/FeatCurveGeometryParasModel.cs
@@ -8,6 +8,6 @@
/// <summary>
/// 鎬ц兘绫诲瀷
/// </summary>
- public Yw.Pump.eFeatType FeatType { get; set; }
+ public Yw.Ahart.eFeatType FeatType { get; set; }
}
}
--
Gitblit v1.9.3