From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
Service/HStation.Service.Assets.Core/04-dal/02-postgresql/05-PipeLineManage/PipeLineMain.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/05-PipeLineManage/PipeLineMain.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/05-PipeLineManage/PipeLineMain.cs
index 42832dd..2c955f0 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/05-PipeLineManage/PipeLineMain.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/05-PipeLineManage/PipeLineMain.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class PipeLineMain : BaseDAL_Sorter<Entity.PipeMain>, IPipeLineMain
+ public partial class PipeLineMain : BaseDAL_Sorter<Entity.AssetsPipeMain>, IPipeLineMain
{
/// <summary>
///
--
Gitblit v1.9.3