From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突

---
 BLL/HStation.BLL.Xhs.Core/03-localclient/01-project/XhsProjectExtensions.cs |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/BLL/HStation.BLL.Xhs.Core/03-localclient/01-project/XhsProjectExtensions.cs b/BLL/HStation.BLL.Xhs.Core/03-localclient/01-project/XhsProjectExtensions.cs
index a9883ee..e4ebbb3 100644
--- a/BLL/HStation.BLL.Xhs.Core/03-localclient/01-project/XhsProjectExtensions.cs
+++ b/BLL/HStation.BLL.Xhs.Core/03-localclient/01-project/XhsProjectExtensions.cs
@@ -1,7 +1,4 @@
-锘�
-using Yw.Dto;
-
-namespace HStation.CAL.LocalClient
+锘縩amespace HStation.CAL.LocalClient
 {
     /// <summary>
     /// 鎶ヨ绛夌骇

--
Gitblit v1.9.3