From 5423ea50d00ce05c87ba443413037d86d7669638 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:55:34 +0800
Subject: [PATCH] 解决冲突
---
Wms/Wms/Controllers/BasisController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 0a43b54..95d7afc 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -1043,7 +1043,7 @@
public async Task DelLogisticsInfo(IdVm model)
{
await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
- SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
+ SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsDelInfo(model.Id);
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", logisit.CarrierName, "鍒犻櫎", "鍒犻櫎鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + logisit.CarrierName, _userManager.UserId);
}
/// <summary>
--
Gitblit v1.8.0