From 94e3cc94d83f5ec1bb64e48360a15d057f3643d9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/enums/TaskIOType.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/enums/TaskIOType.java b/src/main/java/com/zy/asrs/enums/TaskIOType.java
index 8b24ea5..23ae4cd 100644
--- a/src/main/java/com/zy/asrs/enums/TaskIOType.java
+++ b/src/main/java/com/zy/asrs/enums/TaskIOType.java
@@ -24,7 +24,7 @@
PICK_IN("53", "53.鎷ｆ枡鍏ュ簱"),
- MERGE_IN("54", "53.骞舵澘鍏ュ簱"),
+ MERGE_IN("54", "54.骞舵澘鍏ュ簱"),
CHECK_IN("57", "57.鐩樼偣鍏ュ簱"),
--
Gitblit v1.9.1