From ba714cd764bb95cb00c57e93017905c5a03e4079 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 30 十月 2025 12:12:14 +0800
Subject: [PATCH] 1、 二号线禁用时且一拖二情况下优化

---
 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