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/13-print/SimulationPrintViewModel.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/SimulationPrintViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/SimulationPrintViewModel.cs
index 33c4045..f667303 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/SimulationPrintViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/SimulationPrintViewModel.cs
@@ -16,9 +16,14 @@
public List<SimulationPrintPumpViewModel> PumpList { get; set; }
/// <summary>
- /// 姘存车鍒嗘瀽鍒楄〃
+ /// 宸ュ喌鍒楄〃
/// </summary>
- public List<SimulationPrintPumpAnalyViewModel> PumpAnalyList { get; set; }
+ public List<SimulationPrintWorkingViewModel> WorkingList { get; set; }
+
+ /// <summary>
+ /// 鏂规
+ /// </summary>
+ public SimulationPrintSchemeViewModel Scheme { get; set; }
}
--
Gitblit v1.9.3