From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/03-monitor/HydroWorkingMonitorViewModel.cs |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/03-monitor/HydroWorkingMonitorViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/03-monitor/HydroWorkingMonitorViewModel.cs
index 32f10dd..ce60f78 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/03-monitor/HydroWorkingMonitorViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/03-monitor/HydroWorkingMonitorViewModel.cs
@@ -6,6 +6,21 @@
     public class HydroWorkingMonitorViewModel
     {
         /// <summary>
+        /// 
+        /// </summary>
+        public HydroWorkingMonitorViewModel() { }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public HydroWorkingMonitorViewModel(HydroMonitorValueViewModel rhs)
+        {
+            this.Relation = rhs.Vmo.Parter;
+            this.PropName = rhs.Vmo.PropName;
+            this.PropValue = rhs.PropValue;
+        }
+
+        /// <summary>
         /// 鍏宠仈鏋勪欢
         /// Code
         /// </summary>
@@ -19,7 +34,7 @@
         /// <summary>
         /// 灞炴�у��
         /// </summary>
-        public double PropValue { get; set; }
+        public double? PropValue { get; set; }
 
     }
 

--
Gitblit v1.9.3