From b95862489ab29fb811948c4dbec0d155d5f5f602 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 23 七月 2024 14:51:11 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs
index 29a82bb..28bc8ba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs
@@ -1,4 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
namespace HStation.WinFrmUI.Phart
{
@@ -11,13 +11,13 @@
}
- private Model.PumpMain _pump_main = null;
+ private HStation.Dto.Assets.PumpMainDto _pump_main = null;
private Dto.XhsPumpPhartMappingExtensionsStdDto _xhs_phart_diagram_ex_dto = null;
private BLL.XhsPumpPhartMappingExtensions _bll_ex = new();
private BLL.XhsPumpPhartMappingExtensionsStd _bll_ex_std = new();
- public async void InitialDataSource(Model.PumpMain pump_main)
+ public async void InitialDataSource(HStation.Dto.Assets.PumpMainDto pump_main)
{
_pump_main = pump_main;
if (_pump_main == null)
--
Gitblit v1.9.3