From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
Model/HStation.Model.Assets.Core/00-PumpProduct/PumpGroupAndMainMap.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Model/HStation.Model.Assets.Core/00-PumpProduct/PumpGroupAndMainMap.cs b/Model/HStation.Model.Assets.Core/00-PumpProduct/PumpGroupAndMainMap.cs
index 692c069..f32780d 100644
--- a/Model/HStation.Model.Assets.Core/00-PumpProduct/PumpGroupAndMainMap.cs
+++ b/Model/HStation.Model.Assets.Core/00-PumpProduct/PumpGroupAndMainMap.cs
@@ -1,5 +1,4 @@
-锘縰sing SqlSugar;
-using Yw.Model;
+锘縰sing Yw.Model;
namespace HStation.Model
{
--
Gitblit v1.9.3