From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs
index 2e45146..9b90299 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs
@@ -23,12 +23,16 @@
public string RequestType { get; set; } = string.Empty;
public string EquiCodeMOM { get; set; }
+
+ public string Roadways { get; set; }
+
+ public int area { get; set; }
}
public class RequestOutTaskDto
{
- public string Position { get; set; }
+ public string Position { get; set; }
public int Tag { get; set; }
public string AreaCdoe { get; set; }
- public List<string> Roadways { get; set; }
+ public string ProductionLine { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3