From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 09 十月 2024 15:47:59 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 c8e0a81..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,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,7 +43,7 @@ * 鐩爣浣嶇疆 */ @ApiModelProperty(value = "鐩爣浣嶇疆", position = 4) - private Integer targetSlot; + private int targetSlot; /** * 鐜荤拑绫诲瀷 @@ -60,7 +61,7 @@ * 绾胯矾 */ @ApiModelProperty(value = "绾胯矾", position = 7) - private Integer line; + private int line; /** * 瀹藉害 */ @@ -77,5 +78,8 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 8) private Date createTime; + @TableLogic + private int deleted; + } -- Gitblit v1.8.0