From 8785b6b5ee9298308752b53bf546953ae49b8c88 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
index 2a339bb..62fe8b6 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
@@ -10,7 +10,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author wf
@@ -22,54 +22,48 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 璁惧id
*/
private Integer deviceId;
-
/**
* 鏍煎瓙id
*/
- private Integer slotId;
-
+ private Integer slot;
+ /**
+ * 鏋跺瓙淇℃伅
+ */
+ private Integer shelf;
/**
* 鍘熺墖瀹�
*/
private Double patternWidth;
-
/**
* 鍘熺墖楂�
*/
private Double patternHeight;
-
/**
* 鍘熺墖鍘氬害
*/
private Double patternThickness;
-
/**
* 鑶滅郴
*/
private String filmsId;
-
/**
* 鍒涘缓鏃堕棿
*/
private Date createTime;
-
/**
* 鍓╀綑鏁伴噺
*/
private Integer remainQuantity;
-
-
/**
* 鐘舵��
*/
- private int state;
+ private Integer state;
}
--
Gitblit v1.8.0