From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 18c8c2f..d539f7c 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,12 +2,13 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
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>
@@ -27,8 +28,8 @@
/**
* 涓婚敭id
*/
- @ApiModelProperty(value = "涓婚敭id", position = 2)
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭id", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -41,7 +42,7 @@
* 鐩爣浣嶇疆
*/
@ApiModelProperty(value = "鐩爣浣嶇疆", position = 4)
- private Integer tragetSlot;
+ private int targetSlot;
/**
* 鐜荤拑绫诲瀷
@@ -59,7 +60,22 @@
* 绾胯矾
*/
@ApiModelProperty(value = "绾胯矾", position = 7)
- private Integer line;
+ private int line;
+ /**
+ * 瀹藉害
+ */
+ @ApiModelProperty(value = "瀹藉害", position = 8)
+ private Integer width;
+ /**
+ * 楂樺害
+ */
+ @ApiModelProperty(value = "楂樺害", position = 8)
+ private Integer height;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 8)
+ private Date createTime;
}
--
Gitblit v1.8.0