From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
index 0cd1e42..8e01b64 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -16,7 +16,7 @@
TASK_TYPE_MERGE_IN("54", "骞舵澘鍐嶅叆搴�"),
TASK_TYPE_CHECK_IN("57", "鐩樼偣鍐嶅叆搴�"),
TASK_TYPE_OUT("101", "鍑哄簱"),
- TASK_TYPE_PICK_AGAIN_IN("103", "鎷ｆ枡鍏ュ簱"),
+ TASK_TYPE_PICK_AGAIN_IN("103", "鎷ｆ枡鍑哄簱"),
TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"),
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
TASK_TYPE_EMPITY_OUT("110", "绌烘澘鍑哄簱"),
--
Gitblit v1.9.1