From cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 08:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index e717b46..2b2ed15 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -94,20 +94,26 @@
     /**
      * 宸ョ▼鍙�
      */
-    @ApiModelProperty(value = "宸ョ▼鍙�")
+    @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
     private String engineerId;
+
+    /**
+     * 宸ョ▼鍙�
+     */
+    @ApiModelProperty(value = "灞�", position = 17)
+    private String layer;
 
     /**
      * 杩涚墖浠诲姟
      */
-    @ApiModelProperty(value = "杩涚墖浠诲姟", position = 16)
+    @ApiModelProperty(value = "杩涚墖浠诲姟", position = 18)
     @TableField(exist = false)
     private BigStorageCageFeedTask bigStorageCageFeedTask;
 
     /**
      * 鍑虹墖浠诲姟
      */
-    @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 17)
+    @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 19)
     @TableField(exist = false)
     private BigStorageCageOutTask bigStorageCageOutTask;
 

--
Gitblit v1.8.0