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

---
 Service/HStation.Service.Xhs.Project.Core/GlobalUsings.cs |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/Service/HStation.Service.Xhs.Project.Core/GlobalUsings.cs b/Service/HStation.Service.Xhs.Project.Core/GlobalUsings.cs
index 5ae8931..4921077 100644
--- a/Service/HStation.Service.Xhs.Project.Core/GlobalUsings.cs
+++ b/Service/HStation.Service.Xhs.Project.Core/GlobalUsings.cs
@@ -1,10 +1,8 @@
 锘縢lobal using AutoMapper;
 global using HStation.Service.Xhs;
-global using HStation.Settings;
 global using HStation.Xhs;
 global using SqlSugar;
 global using System.Data;
-global using System.Text;
 global using Yw;
 global using Yw.Service;
 global using Yw.Untity;
\ No newline at end of file

--
Gitblit v1.9.3