From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java index 0ebb340..c79112f 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java @@ -1,12 +1,9 @@ package com.mes.downworkstation.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.io.Serializable; /** * <p> @@ -19,8 +16,7 @@ @Data @EqualsAndHashCode(callSuper = false) -public class DownWorkstionAndDownGlassinfo -{ +public class DownWorkstionAndDownGlassinfo { /** * 涓嬬墖宸ヤ綅琛╥d */ @@ -53,14 +49,9 @@ private Integer workState; - @TableField("total_quantity") - private Integer totalquantity; + private Integer totalQuantity; - @TableField("racks_number") - private Integer Racksnumber; - - - + private Integer racksNumber; /** * 椤哄簭 @@ -70,19 +61,19 @@ /** * 瀹� */ - private Double width; + private double width; /** * 楂� */ - private Double height; - private Double totalwidth; + private double height; + private double totalwidth; - private Double totalheight; + private double totalheight; /** * 鍘氬害 */ - private Double thickness; + private double thickness; private String Filmsid; -- Gitblit v1.8.0