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/downworkstation/entity/DownWorkstation.java | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java index ad9296c..896ac12 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * <p> - * + * * </p> * * @author zhoush @@ -23,7 +24,7 @@ /** * 涓嬬墖宸ヤ綅琛╥d */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** @@ -51,10 +52,25 @@ */ private Integer workState; + /** + * 灞傛暟 + */ + private Integer layer; - private Integer total_quantity; - private Integer Racksnumber; + /** + * 鎬绘暟閲� + */ + private Integer totalQuantity; + + /** + * 钀芥灦鏁伴噺 + */ + private Integer racksNumber; + /** + * 浜哄伐涓嬬墖鏁伴噺 + */ + private Integer otherNumber; } -- Gitblit v1.8.0