From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
index dbf6152..a2ec9e5 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
@@ -189,7 +189,7 @@
{
var theSectionParam = bundle.ToSectionShapePara(i);
- double dGama_Left, dGama_Right, dH, dR_out, dBaseWidth, dBaseCircleRadius;
+ double dGama_Left, dGama_Right, dH, dR_out, dBaseWidth, dBaseCircleRadius;
dGama_Left = theSectionParam.Gama_Left;
dGama_Right = theSectionParam.Gama_Right;
dH = theSectionParam.H;
--
Gitblit v1.9.3