From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 07 八月 2024 16:26:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java index 70d5ef2..c7d5a67 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java @@ -1,10 +1,13 @@ package com.mes.downglassinfo.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.stereotype.Component; import java.io.Serializable; +import java.util.Date; /** * <p> @@ -24,8 +27,18 @@ /** * 涓嬬墖鐜荤拑淇℃伅琛╥d */ - + @TableId(value = "id", type = IdType.AUTO) private Long id; + + /** + * 宸ヤ綅id + */ + private Integer workStationId; + + /** + * 宸ョ▼id + */ + private String engineerId; /** * 娴佺▼鍗″彿 @@ -67,5 +80,10 @@ */ private String glassId; + /** + * 鍒涘缓鏃堕棿 + */ + private Date gmtCreate; + } -- Gitblit v1.8.0