From a745fd53a1c8840a886c826c6a6bf0b8b226cd25 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 20 六月 2024 22:07:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index 9f354d8..13fbc8a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -1,11 +1,11 @@
package com.mes.downglassinfo.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -24,8 +24,8 @@
/**
* id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id")
+ private Long id;
/**
* 璧峰
@@ -72,5 +72,13 @@
*/
private Integer taskStauts;
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date CreateTime;
}
--
Gitblit v1.8.0