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/03-service/05-PumpPartMain/PumpPartMain.cs | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Service/HStation.Service.Assets.Core/03-service/05-PumpPartMain/PumpPartMain.cs b/Service/HStation.Service.Assets.Core/03-service/05-PumpPartMain/PumpPartMain.cs index a76a973..a1d815e 100644 --- a/Service/HStation.Service.Assets.Core/03-service/05-PumpPartMain/PumpPartMain.cs +++ b/Service/HStation.Service.Assets.Core/03-service/05-PumpPartMain/PumpPartMain.cs @@ -1,6 +1,4 @@ -锘縰sing System.Security.Cryptography; - -namespace HStation.Service +锘縩amespace HStation.Service { /// <summary> /// -- Gitblit v1.9.3