From 9490957edfc694a0378ee52af47e921b8ac44e7a Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 04 六月 2024 09:12:11 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs b/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
index 9f524d8..ceb76ea 100644
--- a/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
@@ -10,12 +10,12 @@
[Serializable]
public class ReservoirViewModel:NodeViewModel
{
- [Category("璁＄畻鍙傛暟")]
+ [Category("2銆佽绠楀弬鏁�")]
[Description("闇�姘撮噺")]
[DisplayName("闇�姘撮噺(m鲁/h)")]
[Browsable(false)]
public new float Demand { get; set; }
- [Category("璁＄畻鍙傛暟")]
+ [Category("2銆佽绠楀弬鏁�")]
[Description("鎬绘按澶�")]
[DisplayName("缁濆姘村帇(m)")]
public float Head { get; set; }
--
Gitblit v1.9.3