From e2f45c6bce38ee2ffca13510fdf67b00100814cd Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 04 六月 2024 00:18:28 +0800
Subject: [PATCH] [合并]
---
Hydraulic/Hydro.MapView/Base/NodeViewModel.cs | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
index 576987e..31907f7 100644
--- a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
@@ -108,15 +108,10 @@
public virtual float MaxDiameter { get; set; } = 0;
-<<<<<<< HEAD
+
[Category("2銆佽绠楀弬鏁�")]
- [Description("闇�姘撮噺(m)")]
- [DisplayName("闇�姘撮噺(m)")]
-=======
- [Category("璁＄畻鍙傛暟")]
[Description("闇�姘撮噺(m鲁/h)")]
[DisplayName("闇�姘撮噺(m鲁/h)")]
->>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
[Browsable(true)]
public virtual float Demand { get; set; }
--
Gitblit v1.9.3