From ff62f0248bf911a28ffc554447ee63b718d836df Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 13:15:13 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/common/model/enums/IoWorkType.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/model/enums/IoWorkType.java b/src/main/java/com/zy/common/model/enums/IoWorkType.java
index 0077d5c..0083e3e 100644
--- a/src/main/java/com/zy/common/model/enums/IoWorkType.java
+++ b/src/main/java/com/zy/common/model/enums/IoWorkType.java
@@ -6,6 +6,7 @@
     PICK_IN,
     ALL_OUT,
     PICK_OUT,
+    MERGE_OUT,
     CHECK_OUT,
     ;
 

--
Gitblit v1.9.1