From 5af88720773df7be98372ff8bce0acffa5dffb73 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 08 十一月 2024 14:59:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
index f52120b..9799557 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
@@ -42,7 +42,7 @@
         [DisplayName("鑷敱鍘嬪姏")]
         [Display(Name = "鑷敱鍘嬪姏(m)")]
         [DisplayUnit("m")]
-        [IsHydroCalcuPro]
+        [HydroCalcuPro]
         [PropertyOrder(10001)]
         [ShowEditor(false)]
         [Browsable(false)]
@@ -55,7 +55,7 @@
         [DisplayName("缁濆鍘嬪姏")]
         [PropertyOrder(10002)]
         [DisplayUnit("m")]
-        [IsHydroCalcuPro]
+        [HydroCalcuPro]
         [ShowEditor(false)]
         [Browsable(false)]
         public override double? CalcuHead { get; set; }
@@ -67,7 +67,7 @@
         [DisplayName("闇�姘撮噺")]
         [PropertyOrder(10003)]
         [DisplayUnit("m鲁/h")]
-        [IsHydroCalcuPro]
+        [HydroCalcuPro]
         [ShowEditor(false)]
         [Browsable(false)]
         public override double? CalcuDemand { get; set; }
@@ -79,7 +79,7 @@
         [DisplayName("璁$畻娴侀噺")]
         [Display(Name = "璁$畻娴侀噺(m鲁/h)")]
         [DisplayUnit("m鲁/h")]
-        [IsHydroCalcuPro]
+        [HydroCalcuPro]
         [PropertyOrder(11001)]
         [ShowEditor(false)]
         [Browsable(true)]

--
Gitblit v1.9.3