From ea6d75ac403b6a08cf995cecd30c69c2ba66b2d9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 02 七月 2024 12:51:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
index 4cc400f..24f9182 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java
@@ -40,7 +40,7 @@
/**
* 鐜荤拑id
*/
- private Integer glassId;
+ private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
@@ -60,17 +60,17 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
/**
* 閽㈠寲鐗堝浘id
@@ -86,7 +86,7 @@
/**
* 鑶滅郴id
*/
- private int filmsid;
+ private String filmsid;
/**
* 鐘舵��
*/
@@ -96,6 +96,14 @@
* 鐜荤拑闂撮殭
*/
private Integer gap;
+ /**
+ * 鎬诲眰鏁�
+ */
+ private Integer totalLayer;
+ /**
+ * 灞傛暟
+ */
+ private Integer layer;
}
--
Gitblit v1.8.0