From 538ef535070576393224aba7ad43f0a52c98bddb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 11 三月 2026 14:11:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
index 44a9291..2a76053 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
@@ -13,7 +13,9 @@
     ORDER_IN("in", "鍏ュ簱鍗�"),
     ORDER_TRANSFER("transfer", "璋冩嫈鍗�"),
     ORDER_REVISE("revise", "搴撳瓨璋冩暣"),
-    ORDER_CHECK("check", "鐩樼偣鍗�");
+    ORDER_CHECK("check", "鐩樼偣鍗�"),
+    ORDER_PRE("pre","澶囪揣鍗�,鍑哄簱"),
+    ORDER_PRE_NOT_OUT("preNot","澶囪揣鍗曪紝涓嶅嚭");
 
 
     OrderType(String type, String desc) {

--
Gitblit v1.9.1