From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 8e01b64..145dd7d 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
@@ -21,11 +21,11 @@
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
TASK_TYPE_EMPITY_OUT("110", "绌烘澘鍑哄簱"),
;
- public Short type;
+ public Integer type;
public String desc;
TaskType(String type, String desc) {
- this.type = Short.parseShort(type);
+ this.type = Integer.parseInt(type);
this.desc = desc;
}
}
--
Gitblit v1.9.1