From 71ff3ccde064c104db61fa28300b039456c0ba06 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期三, 14 八月 2024 17:18:18 +0800 Subject: [PATCH] 冲突 --- Service/HStation.Service.Assets.Core/01-entity/PumpPartMain.cs | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Service/HStation.Service.Assets.Core/01-entity/PumpPartMain.cs b/Service/HStation.Service.Assets.Core/01-entity/PumpPartMain.cs index 8991dc4..02ae70b 100644 --- a/Service/HStation.Service.Assets.Core/01-entity/PumpPartMain.cs +++ b/Service/HStation.Service.Assets.Core/01-entity/PumpPartMain.cs @@ -1,5 +1,4 @@ -锘縰sing SqlSugar; -using Yw.Entity; +锘縰sing Yw.Entity; namespace HStation.Entity { -- Gitblit v1.9.3