From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java
index c427061..0d3d370 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java
@@ -12,21 +12,52 @@
public class BigStorageCageBaseInfo {
/**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
+ private String engineerId;
+ /**
* 鐜荤拑id
*/
@ApiModelProperty(value = "鐜荤拑id")
private String glassId;
+ /**
+ * 閽㈠寲鐗堝浘id
+ */
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
+ private Integer temperingLayoutId;
+
+ /**
+ * 閽㈠寲鐗堝浘鐗囧簭
+ */
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
+ private Integer temperingFeedSequence;
/**
* 瀹�
*/
@ApiModelProperty(value = "瀹�")
- private Double width;
+ private double width;
+ /**
+ * 瀹�
+ */
+ @ApiModelProperty(value = "楂�")
+ private double height;
+
+ /**
+ * 鍘氬害
+ */
+ @ApiModelProperty(value = "鍘氬害")
+ private double thickness;
+ /**
+ * 鑶滅郴
+ */
+ @ApiModelProperty(value = "鑶滅郴")
+ private String filmsId;
/**
* 鏍煎瓙鍙�
*/
- @ApiModelProperty(value = "鐜荤拑id")
+ @ApiModelProperty(value = "鏍煎瓙鍙�")
private Integer slot;
-
}
--
Gitblit v1.8.0