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/OptimizeProject.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 032b7c5..e23597e 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
@@ -67,7 +67,7 @@
/**
* 鎬婚潰绉�
*/
- private Double glassTotalArea;
+ private double glassTotalArea;
/**
* 娴佺▼鍗℃暟閲�
@@ -87,7 +87,7 @@
/**
* 绗竴娆″钩鍧囧垏瑁佺巼
*/
- private Double fristCutPct;
+ private double fristCutPct;
/**
* 浣跨敤鐨勫師鏂欐暟
@@ -97,22 +97,22 @@
/**
* 浣跨敤鐨勫師鏂欓潰绉�
*/
- private Double rawStockArea;
+ private double rawStockArea;
/**
* 骞冲潎鍒囪鐜�
*/
- private Double avgCutPct;
+ private double avgCutPct;
/**
* 鏈夋晥鍒囪鐜�
*/
- private Double validCutPct;
+ private double validCutPct;
/**
* 灏剧墖鍒囪鐜�
*/
- private Double lastCutPct;
+ private double lastCutPct;
/**
* g娣锋帓绋嬪害
@@ -137,27 +137,27 @@
/**
* g涓婄墖瀹�
*/
- private Double loadWidth;
+ private double loadWidth;
/**
* g涓婄墖闀�
*/
- private Double loadLength;
+ private double loadLength;
/**
* x闂撮殧
*/
- private Double xSpace;
+ private double xSpace;
/**
* y闂撮殧
*/
- private Double ySpace;
+ private double ySpace;
/**
* g骞冲潎瑁呰浇鐜�
*/
- private Double loadRate;
+ private double loadRate;
/**
* 娴佺▼鍗￠泦鍚�
@@ -189,6 +189,15 @@
*/
private Date updateTime;
+// /**
+// * 闄よ啘鏂瑰紡
+// */
+// private Integer filmRemove;
+//
+// /**
+// * 璁惧
+// */
+// private Integer stationCell;
/**
* 棰勭暀锛屼娇鐢ㄩ渶娉ㄦ槑
*/
--
Gitblit v1.8.0