From 84820e6296602b263633ff9a960bfd15cf0618de Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 12:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
index 2df6bcd..a38c376 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
@@ -117,7 +117,7 @@
         /// </summary>
         [DisplayName("闃�闂ㄧ被鍨�")]
         [Browsable(true)]
-        public eValveType ValveType { get; set; }
+        public HStation.Assets.eValveType ValveType { get; set; }
 
         /// <summary>
         /// 闃�闂ㄨ缃�
@@ -173,7 +173,7 @@
         /// </summary>
         [DisplayName("鍖归厤闃�闂ㄧ被鍨�")]
         [Browsable(true)]
-        public eValveType? MatchingValveType { get; set; }
+        public HStation.Assets.eValveType? MatchingValveType { get; set; }
 
         /// <summary>
         /// 鍖归厤闃�闂ㄨ缃�

--
Gitblit v1.9.3