From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
index 5bc1011..a35c5f7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -15,51 +17,62 @@
  * @author makejava
  * @since 2024-10-27 21:04:33
  */
+@ApiModel(description = "(EdgStorageDeviceTaskHistory)琛ㄥ疄浣撶被")
 @SuppressWarnings("serial")
 @Data
 public class EdgStorageDeviceTaskHistory extends Model<EdgStorageDeviceTaskHistory> {
     /**
      * 宸ョ▼琛╥d
      */
+    @ApiModelProperty(value = "宸ョ▼琛╥d", position = 1)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 杩涚墖鐜荤拑id
      */
+    @ApiModelProperty(value = "杩涚墖鐜荤拑id", position = 2)
     private String glassIdIn;
     /**
      * 鍑虹墖鐜荤拑id
      */
+    @ApiModelProperty(value = "鍑虹墖鐜荤拑id", position = 3)
     private String glassIdOut;
     /**
      * 褰撳墠灞傚彿
      */
+    @ApiModelProperty(value = "褰撳墠灞傚彿", position = 4)
     private Integer currentCell;
     /**
      * 灞傚彿
      */
+    @ApiModelProperty(value = "鐩爣灞傚彿", position = 5)
     private Integer startCell;
     /**
      * 棰勭暀灞傚彿
      */
+    @ApiModelProperty(value = "棰勭暀灞傚彿", position = 6)
     private Integer endCell;
     /**
      * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
      */
+    @ApiModelProperty(value = "浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬", position = 7)
     private Integer taskState;
     /**
      * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
      */
+    @ApiModelProperty(value = "浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬", position = 8)
     private Integer taskType;
     /**
      * 鍒涘缓鏃堕棿
      */
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 9)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     /**
      * 鏇存柊鏃堕棿
      */
+    @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 10)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
@@ -67,6 +80,7 @@
     /**
      * 璁惧淇℃伅
      */
+    @ApiModelProperty(value = "璁惧淇℃伅", position = 11)
     private Integer deviceId;
 
 

--
Gitblit v1.8.0