From 5e82a6f55d6f306a15fbf5d3f1855a647df7a105 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 04 七月 2024 16:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java index 5543ab5..410a443 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java @@ -1,10 +1,10 @@ package com.mes.downglassinfo.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.data.annotation.Id; import org.springframework.stereotype.Component; - import java.io.Serializable; @@ -26,13 +26,18 @@ /** * 涓嬬墖鐜荤拑淇℃伅琛╥d */ - + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 娴佺▼鍗″彿 */ private String flowCardId; + + /** + * 灞傚彿 + */ + private Integer layer; /** * 椤哄簭 @@ -42,17 +47,17 @@ /** * 瀹� */ - private Double width; + private double width; /** * 楂� */ - private Double height; + private double height; /** * 鍘氬害 */ - private Double thickness; + private double thickness; /** * 鑶滅郴 -- Gitblit v1.8.0