From 1504150a9e26ef221fc6ac4e0ad494446968d06d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 16:28:22 +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/TaskResouceType.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
index 9915624..3e72343 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
@@ -6,16 +6,15 @@
 public enum TaskResouceType {
 
     //璁㈠崟绫诲瀷
-    TASK_RESOUCE_WAVE_TYPE("1", "娉㈡浠诲姟"),
+    TASK_RESOUCE_WAVE_TYPE("1", "娉㈡鍑哄簱浠诲姟"),
 
     TASK_RESOUCE_STOCK_TYPE("2", "搴撳瓨鍑哄簱浠诲姟"),
 
-    TASK_RESOUCE_PAKIN_TYPE("3", "缁勬嫋浠诲姟"),
+    TASK_RESOUCE_PAKIN_TYPE("3", "缁勬嫋鍏ュ簱浠诲姟"),
 
     TASK_RESOUCE_ORDER_TYPE("4", "鍗曟嵁鍑哄簱浠诲姟"),
 
-    TASK_RESOUCE_CHECK_TYPE("4", "鐩樼偣鍑哄簱浠诲姟"),
-
+    TASK_RESOUCE_CHECK_TYPE("5", "鐩樼偣鍑哄簱浠诲姟"),
 
     ;
     TaskResouceType(String val, String desc) {

--
Gitblit v1.9.1