From b7533c1472fd129bdf19a99c5f8255b647a59b0e Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期三, 03 七月 2024 12:37:56 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 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 09e0a3a..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,12 +1,11 @@ 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 javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import java.io.Serializable; /** @@ -27,14 +26,18 @@ /** * 涓嬬墖鐜荤拑淇℃伅琛╥d */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 娴佺▼鍗″彿 */ private String flowCardId; + + /** + * 灞傚彿 + */ + private Integer layer; /** * 椤哄簭 @@ -44,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