From 0d9526152334f26c9110dab0652796f59a185820 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 13:30:43 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
index fe4b7be..a8a02d9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
@@ -112,4 +112,12 @@
         /// </summary>
         public string Description { get; set; }
     }
+}
+
+public class PhartViewModel
+{
+    public long ID { get; set; }
+    public string OtherName { get; set; }
+    public int Importance { get; set; }
+    public int SortCode { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3