From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期五, 29 十一月 2024 16:35:44 +0800 Subject: [PATCH] 修改冲突后问题 --- Desktop/PBS.Desktop.Core/MainForm.cs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Desktop/PBS.Desktop.Core/MainForm.cs b/Desktop/PBS.Desktop.Core/MainForm.cs index fc4c288..cc0eac7 100644 --- a/Desktop/PBS.Desktop.Core/MainForm.cs +++ b/Desktop/PBS.Desktop.Core/MainForm.cs @@ -7,8 +7,8 @@ using DevExpress.XtraTab.ViewInfo; using HStation.WinFrmUI; using HStation.WinFrmUI.Assets; -using HStation.WinFrmUI.WE; using HStation.WinFrmUI.Xhs.PumpProduct; +using PBS.WinFrmUI.WE; using System.Drawing.Drawing2D; using System.IO; using Yw.WinFrmUI; -- Gitblit v1.9.3