From b853fb2c1aa745d390a66974aad6a260f794664e Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 14 七月 2024 21:50:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxasrs' into ahyxasrs
---
src/main/java/com/zy/common/model/enums/WorkNoType.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/enums/WorkNoType.java b/src/main/java/com/zy/common/model/enums/WorkNoType.java
index e362118..82fd693 100644
--- a/src/main/java/com/zy/common/model/enums/WorkNoType.java
+++ b/src/main/java/com/zy/common/model/enums/WorkNoType.java
@@ -10,9 +10,10 @@
PAKIN(0),
PICK(1),
PAKOUT(2),
- OTHER1(3),
+// OTHER1(3),
OTHER2(4),
- OTHER(5),
+ OTHER3(5),
+ OTHER4(5),
;
public Integer type;
@@ -42,7 +43,7 @@
case 110:
return PAKOUT.type;
case 201:
- return OTHER1.type;
+ return OTHER3.type;
case 202:
return OTHER2.type;
default:
--
Gitblit v1.9.1