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

---
 HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs b/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs
index 8d9c7ba..f29b203 100644
--- a/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs
+++ b/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs
@@ -1,5 +1,4 @@
-锘縰sing HStation.Xhs;
-using Yw.Dto;
+锘縰sing Yw.Dto;
 
 namespace HStation.CAL.LocalClient
 {

--
Gitblit v1.9.3