From 817a1c3860032705a9510fa26371d50cde073f1c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 十二月 2024 11:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 586a7b3..c9576ae 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>
@@ -23,13 +24,23 @@
/**
* 宸ョ▼琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ョ▼鍙�
*/
- private String engineerId;
+ private String engineerId;
+
+ /**
+ * 璁惧
+ */
+ private Integer stationCell;
+
+ /**
+ * 闄よ啘鏂瑰紡
+ */
+ private Integer filmRemove;
/**
* 宸ョ▼鍚嶇О
@@ -39,17 +50,17 @@
/**
* 骞冲潎鍒╃敤鐜�
*/
- private Double avgAvailability;
+ private double avgAvailability;
/**
* 鏈夋晥鍒╃敤鐜�
*/
- private Double validAvailability;
+ private double validAvailability;
/**
* 灏剧墖鍒╃敤鐜�
*/
- private Double lastAvailability;
+ private double lastAvailability;
/**
* 鐘舵��
@@ -64,7 +75,7 @@
/**
* 灏忕墖鎬婚潰绉�
*/
- private Double glassTotalArea;
+ private double glassTotalArea;
/**
* 璁″垝鍘熺墖鎬绘暟
@@ -74,7 +85,7 @@
/**
* 璁″垝鍘熺墖鎬婚潰绉�
*/
- private Double planPatternTotalArea;
+ private double planPatternTotalArea;
/**
* 瀹為檯鍘熺墖鎬绘暟
@@ -84,7 +95,7 @@
/**
* 瀹為檯鍘熺墖鎬婚潰绉�
*/
- private Double realityPatternTotalArea;
+ private double realityPatternTotalArea;
/**
* 鑶滅郴id
@@ -95,6 +106,5 @@
* 澶囨敞
*/
private String notes;
-
}
--
Gitblit v1.8.0