From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
index 30eab79..ddc80fe 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -67,7 +67,7 @@
/**
* 鎬婚潰绉�
*/
- private Double glassTotalArea;
+ private double glassTotalArea;
/**
* 娴佺▼鍗℃暟閲�
@@ -87,7 +87,7 @@
/**
* 绗竴娆″钩鍧囧垏瑁佺巼
*/
- private String fristCutPct;
+ private double fristCutPct;
/**
* 浣跨敤鐨勫師鏂欐暟
@@ -97,22 +97,22 @@
/**
* 浣跨敤鐨勫師鏂欓潰绉�
*/
- private String rawStockArea;
+ private double rawStockArea;
/**
* 骞冲潎鍒囪鐜�
*/
- private String avgCutPct;
+ private double avgCutPct;
/**
* 鏈夋晥鍒囪鐜�
*/
- private String validCutPct;
+ private double validCutPct;
/**
* 灏剧墖鍒囪鐜�
*/
- private String lastCutPct;
+ private double lastCutPct;
/**
* g娣锋帓绋嬪害
@@ -137,27 +137,27 @@
/**
* g涓婄墖瀹�
*/
- private Float loadWidth;
+ private double loadWidth;
/**
* g涓婄墖闀�
*/
- private Float loadLength;
+ private double loadLength;
/**
* x闂撮殧
*/
- private Float xSpace;
+ private double xSpace;
/**
* y闂撮殧
*/
- private Float ySpace;
+ private double ySpace;
/**
* g骞冲潎瑁呰浇鐜�
*/
- private Float loadRate;
+ private double loadRate;
/**
* 娴佺▼鍗￠泦鍚�
@@ -182,12 +182,12 @@
/**
* 鍒涘缓鏃堕棿
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 淇敼鏃堕棿
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 棰勭暀锛屼娇鐢ㄩ渶娉ㄦ槑
--
Gitblit v1.8.0