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

---
 HStation.Service.Organize.Core/01-entity/UserLoginMap.cs |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/HStation.Service.Organize.Core/01-entity/UserLoginMap.cs b/HStation.Service.Organize.Core/01-entity/UserLoginMap.cs
index f224f03..be1c0a0 100644
--- a/HStation.Service.Organize.Core/01-entity/UserLoginMap.cs
+++ b/HStation.Service.Organize.Core/01-entity/UserLoginMap.cs
@@ -1,6 +1,4 @@
-锘縰sing HStation.Service.Organize;
-using System.Runtime.Serialization;
-using Yw.Entity;
+锘縰sing Yw.Entity;
 
 namespace HStation.Entity
 {

--
Gitblit v1.9.3