From 22fb46f2db1714a6b450b353669d26908884653f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 24 十月 2024 10:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 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..035b7d6 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;
+    private Integer enableState;
 
 
 }

--
Gitblit v1.8.0