From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
BLL/HStation.BLL.Assets.Core/02-httpclient/01-Pump/PumpGroupAndMainMap.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/02-httpclient/01-Pump/PumpGroupAndMainMap.cs b/BLL/HStation.BLL.Assets.Core/02-httpclient/01-Pump/PumpGroupAndMainMap.cs
index c20ce77..a76e5ba 100644
--- a/BLL/HStation.BLL.Assets.Core/02-httpclient/01-Pump/PumpGroupAndMainMap.cs
+++ b/BLL/HStation.BLL.Assets.Core/02-httpclient/01-Pump/PumpGroupAndMainMap.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public class AssetsPumpGroupAndMainMap : BaseCAL_Paras_Flags_TagName_Sorter<AddAssetsPumpGroupAndMainMapInput, UpdateAssetsPumpGroupAndMainMapInput, AssetsPumpGroupAndMainMapDto>, IAssetsPumpGroupAndMainMapping
+ public class AssetsPumpGroupAndMainMapping : BaseCAL_Paras_Flags_TagName_Sorter<AddAssetsPumpGroupAndMainMapInput, UpdateAssetsPumpGroupAndMainMapInput, AssetsPumpGroupAndMainMapDto>, IAssetsPumpGroupAndMainMapping
{
protected override string Prefix
{
--
Gitblit v1.9.3