From 3cf23392ce90c0a99835afe2db3a81206e093819 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 10:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/core/model/Task.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/Task.java b/src/main/java/com/zy/core/model/Task.java
index c337aed..9802ae9 100644
--- a/src/main/java/com/zy/core/model/Task.java
+++ b/src/main/java/com/zy/core/model/Task.java
@@ -6,17 +6,34 @@
* Created by vincent on 2020/8/5
*/
@Data
-public class Task<T> {
+public class Task {
private Integer step;
- private T data;
+ private Object data;
+
+ private Long workNo;
+
+ private Short moveSta;
public Task() {
}
- public Task(Integer step, T data) {
+ public Task(Integer step, Object data) {
this.step = step;
this.data = data;
}
+
+ public Task(Integer step, Object data,Long workNo) {
+ this.step = step;
+ this.data = data;
+ this.workNo = workNo;
+ }
+
+ public Task(Integer step, Object data,Long workNo,Short moveSta) {
+ this.step = step;
+ this.data = data;
+ this.workNo = workNo;
+ this.moveSta = moveSta;
+ }
}
--
Gitblit v1.9.1