From b27a75583e7cb6ac6c267b8fc951745ce5bd9ab6 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 16 十二月 2024 15:55:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/BigStorageCageBaseInfo.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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..6cb86a8 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,41 @@
 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 = "鐜荤拑id")
     private Integer slot;
-
 }

--
Gitblit v1.8.0