From a745fd53a1c8840a886c826c6a6bf0b8b226cd25 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 20 六月 2024 22:07:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 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 029d7e0..490bbbf 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
@@ -1,19 +1,26 @@
 package com.mes.bigstorage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zhoush
  * @since 2024-03-27
  */
+@Api(description = "澶х悊鐗囩璇︽儏")
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BigStorageCageDetails implements Serializable {
@@ -23,73 +30,106 @@
     /**
      * 澶х悊鐗囩璇︽儏琛╥d
      */
+      @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
       @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 璁惧id
      */
+    @ApiModelProperty(value = "璁惧id", position = 3)
     private Integer deviceId;
 
     /**
      * 鏍呮牸鍙�
      */
+    @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
     private Integer slot;
 
     /**
      * 鐜荤拑id
      */
+    @ApiModelProperty(value = "鐜荤拑id", position = 5)
     private String glassId;
 
     /**
      * 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
      */
+    @ApiModelProperty(value = "灏忕墖鍦ㄦ牸鍐呯殑椤哄簭", position = 6)
     private Integer sequence;
 
     /**
      * 娴佺▼鍗″彿
      */
+    @ApiModelProperty(value = "娴佺▼鍗″彿", position = 7)
     private String flowCardId;
 
     /**
      * 鐜荤拑绫诲瀷
      */
+    @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
     private Integer glassType;
 
     /**
      * 瀹�
      */
+    @ApiModelProperty(value = "瀹�", position = 9)
     private Double width;
 
     /**
      * 楂�
      */
+    @ApiModelProperty(value = "楂�", position = 10)
     private Double height;
 
     /**
      * 鍘氬害
      */
+    @ApiModelProperty(value = "鍘氬害", position = 11)
     private Double thickness;
 
     /**
      * 閽㈠寲鐗堝浘id
      */
+    @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
     private Integer temperingLayoutId;
 
     /**
      * 閽㈠寲鐗堝浘鐗囧簭
      */
+    @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
     private Integer temperingFeedSequence;
 
     /**
      * 鐘舵��
      */
+    @ApiModelProperty(value = "鐘舵��", position = 14)
     private Integer state;
 
     /**
      * 鐜荤拑闂撮殭
      */
+    @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 15)
     private Integer gap;
 
+    /**
+     * 宸ョ▼鍙�
+     */
+    @ApiModelProperty(value = "宸ョ▼鍙�")
+    private String engineerId;
+
+    /**
+     * 杩涚墖浠诲姟
+     */
+    @ApiModelProperty(value = "杩涚墖浠诲姟", position = 16)
+    @TableField(exist = false)
+    private BigStorageCageFeedTask bigStorageCageFeedTask;
+
+    /**
+     * 鍑虹墖浠诲姟
+     */
+    @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 17)
+    @TableField(exist = false)
+    private BigStorageCageOutTask bigStorageCageOutTask;
 
 }

--
Gitblit v1.8.0