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/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
index a9f3743..e783646 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
@@ -2,9 +2,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -14,22 +19,67 @@
* @author zhoush
* @since 2024-04-16
*/
+@ApiModel(description = "<p> 鐞嗙墖杩涚浠诲姟 </p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class BigStorageCageFeedTask implements Serializable {
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ /**
+ * 涓婚敭id
+ */
+ @ApiModelProperty(value = "涓婚敭id", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- private Integer tragetSlot;
+ /**
+ * 鐜荤拑id
+ */
+ @ApiModelProperty(value = "鐜荤拑id", position = 3)
+ private String glassId;
+ /**
+ * 鐩爣浣嶇疆
+ */
+ @ApiModelProperty(value = "鐩爣浣嶇疆", position = 4)
+ private int targetSlot;
+
+ /**
+ * 鐜荤拑绫诲瀷
+ */
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 5)
private Integer taskType;
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷", position = 6)
private Integer taskState;
- private Integer line;
+ /**
+ * 绾胯矾
+ */
+ @ApiModelProperty(value = "绾胯矾", position = 7)
+ private int line;
+ /**
+ * 瀹藉害
+ */
+ @ApiModelProperty(value = "瀹藉害", position = 8)
+ private Integer width;
+ /**
+ * 楂樺害
+ */
+ @ApiModelProperty(value = "楂樺害", position = 8)
+ private Integer height;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 8)
+ private Date createTime;
+
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0