From 112ff5924fd5f6114c1562af60ca16e6eba6f7fb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十月 2025 08:34:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java | 14 ++++++++------
1 files changed, 8 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..02d696e 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
@@ -3,11 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -19,6 +20,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@TableName("pp.optimize_layout")
public class OptimizeLayout implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,13 +38,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 +96,7 @@
*/
private Integer creater;
- private LocalDateTime createTime;
+ private Date createTime;
@TableField("intRemark")
private Integer intremark;
--
Gitblit v1.8.0