From 01886224dbfcf640d77ca29566892de91492d100 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 17 四月 2024 10:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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