From c80d68ee7d5ceb5f93289220a410737da3a7bf9f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 08:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ssdwcs' into ssdwcs
---
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index e01d5a5..37c83aa 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -173,9 +173,14 @@
@TableField("command_step")
private Integer commandStep;
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+// @ApiModelProperty(value= "")
+// @TableId(value = "id", type = IdType.AUTO)
+// private Long id;
+
+
+ @ApiModelProperty(value = "绉诲簱鏍囪")
+ @TableField("transfer_mark")
+ private Integer transferMark;
public TaskWrkLog() {}
@@ -232,9 +237,11 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1