From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/ReservoirViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/ReservoirViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/ReservoirViewModel.cs
index 5b005dd..1ea8d63 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/ReservoirViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/ReservoirViewModel.cs
@@ -8,7 +8,7 @@
namespace Yw.WinFrmUI.Q3d
{
[Serializable]
- public class ReservoirViewModel:NodeViewModel
+ public class ReservoirViewModel : NodeViewModel
{
[Category("璁＄畻鍙傛暟")]
[Description("闇�姘撮噺")]
@@ -18,7 +18,7 @@
[Category("璁＄畻鍙傛暟")]
[Description("鎬绘按澶�")]
[DisplayName("缁濆姘村帇(m)")]
- public float Head { get; set; }
+ public float Head { get; set; }
//public string Pattern { get; set; }
public override string ToString()
{
--
Gitblit v1.9.3