From 5d8b95b69c1bf800f2a2ebee62c6f7181c0bd7c8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 16:35:46 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.Desktop.PBS.Core/Program.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Desktop/HStation.Desktop.PBS.Core/Program.cs b/Desktop/HStation.Desktop.PBS.Core/Program.cs
index 6f3ad2f..05e29f1 100644
--- a/Desktop/HStation.Desktop.PBS.Core/Program.cs
+++ b/Desktop/HStation.Desktop.PBS.Core/Program.cs
@@ -1,4 +1,5 @@
using DevExpress.LookAndFeel;
+using HStation.Desktop.PBS.Core;
using Mapster;
namespace HStation.Desktop
@@ -70,7 +71,7 @@
//Assembly.Load("HStation.BLL.PBS.Core")
);
DbFirstHelper.Initial();
- Yw.WinFrmUI.GlobalParas.AppIcon = HStation.Desktop.PBS.Core.Properties.Resources.app;
+ Yw.WinFrmUI.GlobalParas.AppIcon = HStation.Desktop.PBS.Core.Properties.Resources.app;
Application.Run(new MainForm());
}
}
--
Gitblit v1.9.3