From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突

---
 Vmo/HStation.Vmo.PBS.Core/GlobalUsings.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Vmo/HStation.Vmo.PBS.Core/GlobalUsings.cs b/Vmo/HStation.Vmo.PBS.Core/GlobalUsings.cs
index 5f28270..1014d06 100644
--- a/Vmo/HStation.Vmo.PBS.Core/GlobalUsings.cs
+++ b/Vmo/HStation.Vmo.PBS.Core/GlobalUsings.cs
@@ -1 +1 @@
-锘�
\ No newline at end of file
+锘縢lobal using HStation.Dto.PBS;
\ No newline at end of file

--
Gitblit v1.9.3