From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 10 五月 2024 16:29:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 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 40a5d0b..5543ab5 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 @@ -2,7 +2,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.data.annotation.Id; import org.springframework.stereotype.Component; + import java.io.Serializable; @@ -24,6 +26,7 @@ /** * 涓嬬墖鐜荤拑淇℃伅琛╥d */ + private Long id; /** @@ -51,8 +54,15 @@ */ private Double thickness; - + /** + * 鑶滅郴 + */ private String Filmsid; + /** + * 鐜荤拑id + */ + private String glassId; + } -- Gitblit v1.8.0