From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java | 80 +++++++---------------------------------
1 files changed, 14 insertions(+), 66 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
index 76da660..e037a41 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
@@ -2,9 +2,16 @@
import java.io.Serializable;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
+import org.springframework.stereotype.Component;
/**
*
@@ -12,6 +19,9 @@
* @author system
* @since 2024-07-09 14:51:27
*/
+@Data
+@Component
+@EqualsAndHashCode(callSuper = false)
@TableName("storage_task")
@ApiModel(value = "StorageTask", description = " ")
public class StorageTask implements Serializable{
@@ -21,9 +31,8 @@
/**
*
*/
- @ApiModelProperty(" ")
- private Long id;
-
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 浠诲姟绫诲瀷
*/
@@ -66,69 +75,8 @@
@ApiModelProperty("瀹屾垚鏃堕棿")
private Date finishTime;
+ @ApiModelProperty("鍓嶇浠诲姟绫诲瀷")
+ private String Type;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getTaskType() {
- return taskType;
- }
-
- public void setTaskType(String taskType) {
- this.taskType = taskType;
- }
-
- public String getTaskState() {
- return taskState;
- }
-
- public void setTaskState(String taskState) {
- this.taskState = taskState;
- }
-
- public String getShelfRack() {
- return shelfRack;
- }
-
- public void setShelfRack(String shelfRack) {
- this.shelfRack = shelfRack;
- }
-
- public String getLoadRack() {
- return loadRack;
- }
-
- public void setLoadRack(String loadRack) {
- this.loadRack = loadRack;
- }
-
- public Integer getRouteGroup() {
- return routeGroup;
- }
-
- public void setRouteGroup(Integer routeGroup) {
- this.routeGroup = routeGroup;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getFinishTime() {
- return finishTime;
- }
-
- public void setFinishTime(Date finishTime) {
- this.finishTime = finishTime;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0