From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..1d59674 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>
@@ -36,13 +36,13 @@
*/
private Integer stockId;
- private Double width;
+ private double width;
- private Double height;
+ private double height;
- private Double realwidth;
+ private double realwidth;
- private Double realheight;
+ private double realheight;
/**
* 鍒囪鐜�
@@ -94,7 +94,7 @@
*/
private Integer creater;
- private LocalDateTime createTime;
+ private Date createTime;
@TableField("intRemark")
private Integer intremark;
--
Gitblit v1.8.0