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.Assets.Core/01-entity/PumpPropContent.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/01-entity/PumpPropContent.cs b/Service/HStation.Service.Assets.Core/01-entity/PumpPropContent.cs
index e0e3a46..b029a66 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/PumpPropContent.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/PumpPropContent.cs
@@ -1,5 +1,4 @@
-锘縰sing SqlSugar;
-using Yw.Entity;
+锘縰sing Yw.Entity;
 
 namespace HStation.Entity
 {

--
Gitblit v1.9.3