From 8a1377922fb3320b7a2ff359ee7e006163fcff47 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:30 +0800
Subject: [PATCH] 解决冲突

---
 Admin.NET/WCS.Application/Entity/WcsTask.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Admin.NET/WCS.Application/Entity/WcsTask.cs b/Admin.NET/WCS.Application/Entity/WcsTask.cs
index 8119603..4a3b69b 100644
--- a/Admin.NET/WCS.Application/Entity/WcsTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -113,7 +113,7 @@
     /// 鎷ｈ揣鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "UnstackingMode", ColumnDescription = "鎷ｈ揣鏂瑰紡", Length = 10)]
-    public string? UnstackingMode { get; set; }
+    public UnstackingModeEnum? UnstackingMode { get; set; }
     
     /// <summary>
     /// 鍙栨秷鏃堕棿

--
Gitblit v1.8.0