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/rawglassstation/entity/RawGlassStorageStation.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
index 8f1db02..cb0484e 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
@@ -17,33 +17,24 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 璁惧id
*/
private Integer deviceId;
-
/**
* 鏍呮牸鍙�
*/
private Integer slot;
-
+ /**
+ * 鏍呮牸鍙�
+ */
+ private Integer shelf;
/**
* 鍚敤鏍囪
*/
private String enableState;
-
- /**
- * 寮�濮嬪伐浣�
- */
- private Integer startSlot;
-
- /**
- * 鐩爣宸ヤ綅
- */
- private Integer endSlot;
}
--
Gitblit v1.8.0