From 68ee8235c8cd659fba5e59e3d924d5ea093504ab Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 18 七月 2024 08:39:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java index 810e146..1d660e3 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java @@ -4,6 +4,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * <p> @@ -31,7 +32,8 @@ private Integer status; + private Integer line; - + private Date time; } -- Gitblit v1.8.0