From ba9d50cf57f3d1a35f1d043871a0f09bc3ac6116 Mon Sep 17 00:00:00 2001
From: 陈勇 <chenyong@hnkhzn.com>
Date: 星期四, 01 二月 2024 09:20:27 +0800
Subject: [PATCH] MES接口等
---
代码管理/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
index f43a0e4..6f0e255 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
@@ -15,6 +15,11 @@
/// <summary>
/// 绌鸿揣浣�
/// </summary>
+<<<<<<< Updated upstream
Empty
+=======
+ Empty,
+ Busy
+>>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3