From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
BLL/HStation.BLL.Assets.Core/03-localclient/01-Pump/PumpMain.cs | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-Pump/PumpMain.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-Pump/PumpMain.cs
index 8a06d58..8a46c6c 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-Pump/PumpMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/01-Pump/PumpMain.cs
@@ -1,6 +1,4 @@
-锘縰sing Yw.Dto;
-
-namespace HStation.CAL.LocalClient
+锘縩amespace HStation.CAL.LocalClient
{
/// <summary>
/// 鎶ヨ绛夌骇
--
Gitblit v1.9.3