From 5e82a6f55d6f306a15fbf5d3f1855a647df7a105 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 04 七月 2024 16:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java |   22 +++++++++++-----------
 1 files changed, 11 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..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
@@ -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;
 
     /**
      * 娴佺▼鍗¢泦鍚�

--
Gitblit v1.8.0