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/Enum/TaskEnum.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Enum/TaskEnum.cs b/Admin.NET/WCS.Application/Enum/TaskEnum.cs
index d35bae5..c59998b 100644
--- a/Admin.NET/WCS.Application/Enum/TaskEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/TaskEnum.cs
@@ -85,4 +85,22 @@
/// </summary>
[Description("鍥炰紶澶辫触")]
Fail = 1
+}
+/// <summary>
+/// 鎷ｈ揣鏂瑰紡
+/// </summary>
+[Description("鎷ｈ揣鏂瑰紡")]
+public enum UnstackingModeEnum
+{
+ /// <summary>
+ /// 鏈哄櫒鎷嗘墭鍑�
+ /// </summary>
+ [Description("鏈哄櫒鎷嗘墭鍑�")]
+ Machine = 0,
+
+ /// <summary>
+ /// 浜哄伐鎷ｈ揣鍑�
+ /// </summary>
+ [Description("浜哄伐鎷ｈ揣鍑�")]
+ Artificial = 1,
}
\ No newline at end of file
--
Gitblit v1.8.0