From 5d70dcef9c9b4f7eb1cd092dcc4f4b8b802c5d30 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 17 四月 2024 10:53:38 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java index f9a85ec..75e4d99 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -94,7 +94,7 @@ */ private Integer creater; - private LocalDateTime createTime; + private Date createTime; @TableField("intRemark") private Integer intremark; -- Gitblit v1.8.0