From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
index 833e9d8..4379860 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
@@ -1,49 +1,61 @@
 package com.mes.downstorage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+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 DownStorageCage implements Serializable {
 
+    @ApiModelProperty(hidden = true)
     private static final long serialVersionUID = 1L;
 
     /**
      * 涓嬬墖鍓嶇悊鐗囩琛╥d
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "涓嬬墖鍓嶇悊鐗囩琛╥d", position = 2)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
      * 璁惧id
      */
+    @ApiModelProperty(value = "璁惧id", position = 3)
     private Integer deviceId;
 
     /**
      * 鏍呮牸鍙�
      */
+    @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
     private Integer slot;
 
     /**
      * 鍚敤鐘舵��
      */
-    private String enableState;
+    @ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
+    @TableField("enable_state")
+    private Integer enableState;
 
     /**
      * 鍓╀綑
      */
+    @ApiModelProperty(value = "鍓╀綑", position = 6)
     private Integer remainWidth;
 
 

--
Gitblit v1.8.0