From 3720316038d2d2e283d9ef3c4385b76c2b4ada34 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 15:29:45 +0800
Subject: [PATCH] 冲突

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

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
index f8910bc..937a70f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
@@ -120,4 +120,6 @@
     public string OtherName { get; set; }
     public int Importance { get; set; }
     public int SortCode { get; set; }
+
+    public long DiagramID { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3