From a92d86ece26b6b0a7ef0c25b384ebcc10b8145ed Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期二, 02 七月 2024 10:06:35 +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 | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 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 3aa224c..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,18 +1,23 @@ package com.mes.downglassinfo.entity; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.stereotype.Component; + +import java.io.Serializable; /** * <p> - * + * * </p> * * @author zhoush * @since 2024-03-27 */ @Data +@Component @EqualsAndHashCode(callSuper = false) public class DownGlassInfo implements Serializable { @@ -21,12 +26,18 @@ /** * 涓嬬墖鐜荤拑淇℃伅琛╥d */ - private Integer id; + @TableId(value = "id", type = IdType.AUTO) + private Long id; /** * 娴佺▼鍗″彿 */ private String flowCardId; + + /** + * 灞傚彿 + */ + private Integer layer; /** * 椤哄簭 @@ -36,17 +47,27 @@ /** * 瀹� */ - private Double width; + private double width; /** * 楂� */ - private Double height; + private double height; /** * 鍘氬害 */ - private Double thickness; + private double thickness; + + /** + * 鑶滅郴 + */ + private String Filmsid; + + /** + * 鐜荤拑id + */ + private String glassId; } -- Gitblit v1.8.0