From d6f0e111f50f78057ff386f7c6fef7e463d12ba5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 九月 2024 15:32:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipeLineViewModel.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipeLineViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipeLineViewModel.cs
index 30903c1..e4f7a7c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipeLineViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipeLineViewModel.cs
@@ -65,21 +65,21 @@
         /// </summary>
         [DisplayName("Hazen")]
         [Browsable(true)]
-        public string Hazen { get; set; }
+        public double Hazen { get; set; }
 
         /// <summary>
         /// Darcy
         /// </summary>
         [DisplayName("Darcy")]
         [Browsable(true)]
-        public string Darcy { get; set; }
+        public double? Darcy { get; set; }
 
         /// <summary>
         /// Manning
         /// </summary>
         [DisplayName("Manning")]
         [Browsable(true)]
-        public string Manning { get; set; }
+        public double? Manning { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�

--
Gitblit v1.9.3