HangZhouMes.git

			@@ -2,6 +2,8 @@

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.mes.base.entity.BigStorageCageBaseInfo;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -20,7 +22,7 @@
			@ApiModel(description = "<p> 钢化小片信息表 </p>")
			@Data
			@EqualsAndHashCode(callSuper = false)
			public class TemperingGlassInfo implements Serializable {
			public class TemperingGlassInfo extends BigStorageCageBaseInfo implements Serializable {

			private static final long serialVersionUID = 1L;

			@@ -30,12 +32,6 @@
			@ApiModelProperty(value = "钢化小片信息表id", position = 2)
			@TableId(value = "id", type = IdType.AUTO)
			private Long id;

			/**
			* 玻璃id
			*/
			@ApiModelProperty(value = "玻璃id", position = 3)
			private String glassId;

			/**
			* 流程卡
			@@ -50,28 +46,16 @@
			private Integer glassType;

			/**
			* 宽
			*/
			@ApiModelProperty(value = "宽", position = 6)
			private Double width;

			/**
			* 高
			*/
			@ApiModelProperty(value = "高", position = 7)
			private Double height;

			/**
			* 厚度
			*/
			@ApiModelProperty(value = "厚度", position = 8)
			private Double thickness;
			private double thickness;

			/**
			* 膜系
			*/
			@ApiModelProperty(value = "膜系", position = 9)
			private Integer filmsid;
			private String filmsid;

			/**
			* 钢化是否接受横放
			@@ -92,18 +76,6 @@
			private Integer temperingFeedSequence;

			/**
			* x坐标
			*/
			@ApiModelProperty(value = "x坐标", position = 13)
			private Integer xCoordinate;

			/**
			* y坐标
			*/
			@ApiModelProperty(value = "y坐标", position = 14)
			private Integer yCoordinate;

			/**
			* 旋转角度（逆时针）
			*/
			@ApiModelProperty(value = "旋转角度（逆时针）", position = 15)
			@@ -114,10 +86,13 @@
			*/
			@ApiModelProperty(value = "状态", position = 16)
			private Integer state;

			/**
			* 格子号
			* 工程id
			*/
			private Integer slot;
			@ApiModelProperty(value = "工程id", position = 17)
			private String engineerId;


			@TableLogic
			private int deleted;
			}