From 69e3dd71185b1cdaf524a4d2a25bf9648bd02ff4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 10 五月 2024 17:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 beb015c..032b7c5 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
@@ -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;
 
     /**
      * 娴佺▼鍗¢泦鍚�

--
Gitblit v1.8.0