From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs
index 50aa339..4732d2a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs
@@ -22,7 +22,7 @@
// POST: api/CellState/GetTrayCellState
[HttpPost("GetTrayCellState")]
- public Task<dynamic> GetTrayCellStateAsync([FromBody] TrayCellsStatusDto input)
+ public Task<WebResponseContent> GetTrayCellStateAsync([FromBody] TrayCellsStatusDto input)
{
return _cellStateService.GetTrayCellStatusAsync(input);
}
--
Gitblit v1.9.3