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

---
 HStation.Dto.Assets.Core/00-PumpProduct/07-PumpMainAndPartMap/PumpMainAndPartMapDto.cs |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/HStation.Dto.Assets.Core/00-PumpProduct/07-PumpMainAndPartMap/PumpMainAndPartMapDto.cs b/HStation.Dto.Assets.Core/00-PumpProduct/07-PumpMainAndPartMap/PumpMainAndPartMapDto.cs
index ca551a3..3b37c85 100644
--- a/HStation.Dto.Assets.Core/00-PumpProduct/07-PumpMainAndPartMap/PumpMainAndPartMapDto.cs
+++ b/HStation.Dto.Assets.Core/00-PumpProduct/07-PumpMainAndPartMap/PumpMainAndPartMapDto.cs
@@ -1,6 +1,4 @@
-锘縰sing Yw.Model;
-
-namespace HStation.Dto.Assets
+锘縩amespace HStation.Dto.Assets
 {
     public class PumpMainAndPartMapDto
     {

--
Gitblit v1.9.3