From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
index 787a0c6..a83b663 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
@@ -2,9 +2,12 @@
 
 public enum EquipmentLeanOutStatusEnum {
     WAIT_SUBMIT, //寰呮彁浜�
-    WAIT_APPROVAL, //寰呭鎵�
+    WAIT_APPROVAL_OUT, //寰呬娇鐢ㄥ崟浣嶅嚭鍘傚鎵�
+    WAIT_APPROVAL_IN, //寰呭叆鍘傚鎵�
     WAIT_RETURN, //寰呭綊杩�
-    WAIT_CONFIRM, //寰呯‘璁�
+    WAIT_CONFIRM_RETURN, //寰呭綊杩樻柟纭
+    WAIT_CONFIRM_BORROW, //寰呭�熺敤鏂圭‘璁�
+    REJECT, //宸查┏鍥�
     COMPLETE, //宸插畬鎴�
     ;
     public static EquipmentLeanOutStatusEnum getInstance(String code) {

--
Gitblit v1.9.3