From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/02-image/UniversalChartImageImportCtrl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/02-image/UniversalChartImageImportCtrl.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/02-image/UniversalChartImageImportCtrl.cs
index b186136..5e6a945 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/02-image/UniversalChartImageImportCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/02-image/UniversalChartImageImportCtrl.cs
@@ -20,10 +20,10 @@
/// <summary>
/// 鑾峰彇
/// </summary>
- public HStation.Vmo.PhartDiagramRelationExtensionsVmo Get()
+ public Yw.Vmo.PhartDiagramExGraphListVmo Get()
{
- return new Vmo.PhartDiagramRelationExtensionsVmo();
- }
+ return new();
+ }
}
--
Gitblit v1.9.3