From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
Application/HStation.Application.Assets.Core/01-Pump/PumpMain_Controller.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Application/HStation.Application.Assets.Core/01-Pump/PumpMain_Controller.cs b/Application/HStation.Application.Assets.Core/01-Pump/PumpMain_Controller.cs
index f9cd17b..4c6fbc3 100644
--- a/Application/HStation.Application.Assets.Core/01-Pump/PumpMain_Controller.cs
+++ b/Application/HStation.Application.Assets.Core/01-Pump/PumpMain_Controller.cs
@@ -91,10 +91,10 @@
/// </summary>
[Route("InsertEx@V1.0")]
[HttpPost]
- public long InsertEx(AddAssetsPumpMainInput input, AddAssetsPumpGroupAndMainMapInput mainmap)
+ public long InsertEx(AddPumpMainExInput input)
{
- var mainmodel = input.Adapt<AddAssetsPumpMainInput, Model.AssetsPumpMain>();
- var mainmapmodel = mainmap.Adapt<AddAssetsPumpGroupAndMainMapInput, Model.AssetsPumpGroupAndMainMapping>();
+ var mainmodel = input.MainInput.Adapt<AddAssetsPumpMainInput, Model.AssetsPumpMain>();
+ var mainmapmodel = input.MainMapInput.Adapt<AddAssetsPumpGroupAndMainMapInput, Model.AssetsPumpGroupAndMainMapping>();
mainmodel.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.InsertEx(mainmodel, mainmapmodel);
return id;
--
Gitblit v1.9.3