From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
index 88dbe2c..50760d4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
@@ -44,11 +44,8 @@
/// </summary>
ConveyorLineBarcode,
- /// <summary>
- /// 璇锋眰鍙嶉
- /// </summary>
- ResponState,
+ Reserve1,
Reserve2,
Reserve3,
@@ -66,8 +63,11 @@
/// 鎶ヨ浠ｇ爜
/// </summary>
ConveyorLineAlarm,
-
- Reserve4,
+
+ /// <summary>
+ /// 璇锋眰鍙嶉
+ /// </summary>
+ ResponState,
Reserve5,
#endregion
--
Gitblit v1.9.3