From 8e1ee5781fb9c3a812c24934d74272bcc1a6eaa0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 七月 2024 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index 4e68183..c9321fa 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -2,9 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -39,17 +40,17 @@
     /**
      * 骞冲潎鍒╃敤鐜�
      */
-    private Double avgAvailability;
+    private double avgAvailability;
 
     /**
      * 鏈夋晥鍒╃敤鐜�
      */
-    private Double validAvailability;
+    private double validAvailability;
 
     /**
      * 灏剧墖鍒╃敤鐜�
      */
-    private Double lastAvailability;
+    private double lastAvailability;
 
     /**
      * 鐘舵��
@@ -64,7 +65,7 @@
     /**
      * 灏忕墖鎬婚潰绉�
      */
-    private Double glassTotalArea;
+    private double glassTotalArea;
 
     /**
      * 璁″垝鍘熺墖鎬绘暟
@@ -74,7 +75,7 @@
     /**
      * 璁″垝鍘熺墖鎬婚潰绉�
      */
-    private Double planPatternTotalArea;
+    private double planPatternTotalArea;
 
     /**
      * 瀹為檯鍘熺墖鎬绘暟
@@ -84,12 +85,12 @@
     /**
      * 瀹為檯鍘熺墖鎬婚潰绉�
      */
-    private Double realityPatternTotalArea;
+    private double realityPatternTotalArea;
 
     /**
      * 鑶滅郴id
      */
-    private Integer filmsId;
+    private String filmsId;
 
     /**
      * 澶囨敞

--
Gitblit v1.8.0