From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
index fa50623..b267cd3 100644
--- a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
@@ -2,16 +2,16 @@
public enum TaskStatusType {
- RECEIVE(1,"鎺ユ敹"),
- DISTRIBUTE(2,"娲惧彂"),
- COMPLETE(3,"瀹岀粨"),
- CANCEL(4,"鍙栨秷"),
- ;
+ RECEIVE(1, "鎺ユ敹"),
+ DISTRIBUTE(2, "娲惧彂"),
+ //COMPLETE(3, "鍛戒护瀹屾垚"),
+ CANCEL(4, "鍙栨秷"),
+ OVER(5, "瀹岀粨");
public Integer id;
public String desc;
- TaskStatusType(Integer id, String desc){
+ TaskStatusType(Integer id, String desc) {
this.id = id;
this.desc = desc;
}
--
Gitblit v1.9.1