From 6671a156075e3fafe63b7768f2e81df4634f04f8 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 25 七月 2024 10:21:57 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java index 66a5c48..3fa49a8 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.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; /** @@ -49,22 +50,22 @@ /** * 鍘熺墖瀹� */ - private Double patternWidth; + private double patternWidth; /** * 鍘熺墖楂� */ - private Double patternHeigth; + private double patternHeight; /** * 鍘熺墖鍘氬害 */ - private Double patternThickness; + private double patternThickness; /** * 鑶滅郴 */ - private Integer filmsId; + private String filmsId; /** * 鏁伴噺 -- Gitblit v1.8.0