From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +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/04-instrument/00-core/HydroInstrumentViewModel.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroInstrumentViewModel.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroInstrumentViewModel.cs
index 0d379a6..4ddb286 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroFlowmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/00-core/HydroInstrumentViewModel.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 浠〃瑙嗗浘
     /// </summary>
-    public class HydroInstrumentViewModel : HydroJunctionViewModel
+    public class HydroInstrumentViewModel : HydroJunctionViewModel, IHydroCalcuInstrumentResult
     {
         /// <summary>
         /// 

--
Gitblit v1.9.3