From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Model/TaskRequest.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 42b047f..7587e00 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -4,7 +4,7 @@
{
public string TaskNo { get; set; } // 浠诲姟鍙�
public string PalletNo { get; set; } // 鎵樼洏鍙�
- public string TaskType { get; set; } // 浠诲姟绫诲瀷
+ public TaskTypeEnum TaskType { get; set; } // 浠诲姟绫诲瀷
public TaskStatusEnum TaskStatus { get; set; } // 浠诲姟鐘舵�� 0 绛夊緟鎵ц 1 姝ｅ湪鎵ц 2 鎵ц瀹屾垚 3 寮傚父缁撴潫 4 浠诲姟鍙栨秷
}
public class ResponseTasks
--
Gitblit v1.8.0