From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 26 ++++++++++++++++++--------
1 files changed, 18 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 94df6c1..9300779 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
@@ -24,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;
/**
* 宸ョ▼鍚嶇О
@@ -40,17 +50,17 @@
/**
* 骞冲潎鍒╃敤鐜�
*/
- private Double avgAvailability;
+ private double avgAvailability;
/**
* 鏈夋晥鍒╃敤鐜�
*/
- private Double validAvailability;
+ private double validAvailability;
/**
* 灏剧墖鍒╃敤鐜�
*/
- private Double lastAvailability;
+ private double lastAvailability;
/**
* 鐘舵��
@@ -65,7 +75,7 @@
/**
* 灏忕墖鎬婚潰绉�
*/
- private Double glassTotalArea;
+ private double glassTotalArea;
/**
* 璁″垝鍘熺墖鎬绘暟
@@ -75,7 +85,7 @@
/**
* 璁″垝鍘熺墖鎬婚潰绉�
*/
- private Double planPatternTotalArea;
+ private double planPatternTotalArea;
/**
* 瀹為檯鍘熺墖鎬绘暟
@@ -85,7 +95,7 @@
/**
* 瀹為檯鍘熺墖鎬婚潰绉�
*/
- private Double realityPatternTotalArea;
+ private double realityPatternTotalArea;
/**
* 鑶滅郴id
--
Gitblit v1.8.0