From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 23 六月 2025 17:05:12 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java index eeff475..328b013 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java @@ -14,15 +14,15 @@ WAVE_ITEM_EXCE_STATUS_UN("0", "鏈墽琛�"), WAVE_EXCE_STATUS_ING("1", "鎵ц涓�"), WAVE_EXCE_STATUS_SEED("2", "宸蹭笅鍙�"), - WAVE_EXCE_STATUS_DONE("3", "瀹屾垚"), + WAVE_ITEM_EXCE_PAUSE("4", "鏆傚仠"), + WAVE_EXCE_STATUS_DONE("3", "涓嬪彂瀹屾垚"), ; - WaveExceStatus(String val, String desc) { + WaveItemExceStatus(String val, String desc) { this.val = Short.parseShort(val); this.desc = desc; } public Short val; - public String desc; } -- Gitblit v1.9.1