From c407e091ff0320625ef2566a4bea362c697200c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCageDetails.java | 19 ++++++++++++++-----
1 files changed, 14 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 e50436f..02f58ca 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
@@ -2,13 +2,14 @@
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>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,7 +24,7 @@
/**
* 涓嬬墖鍓嶇悊鐗囩鏄庣粏琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -39,7 +40,7 @@
/**
* 鐜荤拑id
*/
- private Integer glassId;
+ private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
@@ -85,7 +86,7 @@
/**
* 鑶滅郴id
*/
- private int filmsid;
+ private String filmsid;
/**
* 鐘舵��
*/
@@ -95,6 +96,14 @@
* 鐜荤拑闂撮殭
*/
private Integer gap;
+ /**
+ * 鎬诲眰鏁�
+ */
+ private Integer totalLayer;
+ /**
+ * 灞傛暟
+ */
+ private Integer layer;
}
--
Gitblit v1.8.0