From 388c43ee7b741eebafa98cd8ef992005f1aa56f4 Mon Sep 17 00:00:00 2001
From: 陈勇 <chenyong@hnkhzn.com>
Date: 星期二, 12 三月 2024 14:52:40 +0800
Subject: [PATCH] PDA源程序
---
代码管理/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 6f0e255..3f8a147 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,11 +15,14 @@
/// <summary>
/// 绌鸿揣浣�
/// </summary>
-<<<<<<< Updated upstream
- Empty
-=======
Empty,
- Busy
->>>>>>> Stashed changes
+ /// <summary>
+ /// 鍗犵敤
+ /// </summary>
+ Busy,
+ /// <summary>
+ /// 寮傚父
+ /// </summary>
+ Abnormal
}
}
--
Gitblit v1.9.3