YiWuProject.git

			@@ -1,7 +1,11 @@
			package com.mes.bigstorage.entity;

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.mes.base.entity.BigStorageCageBaseInfo;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -20,15 +24,15 @@
			@Api(description = "大理片笼详情")
			@Data
			@EqualsAndHashCode(callSuper = false)
			public class BigStorageCageDetails implements Serializable {
			public class BigStorageCageDetails extends BigStorageCageBaseInfo implements Serializable {

			private static final long serialVersionUID = 1L;

			/**
			* 大理片笼详情表id
			*/
			@ApiModelProperty(value = "大理片笼详情表id", position = 2)
			@TableId(value = "id", type = IdType.AUTO)
			@ApiModelProperty(value = "大理片笼详情表id", position = 2)
			@TableId(value = "id", type = IdType.AUTO)
			private Long id;

			/**
			@@ -37,17 +41,6 @@
			@ApiModelProperty(value = "设备id", position = 3)
			private Integer deviceId;

			/**
			* 栅格号
			*/
			@ApiModelProperty(value = "栅格号", position = 4)
			private Integer slot;

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

			/**
			* 小片在格内的顺序
			@@ -66,12 +59,6 @@
			*/
			@ApiModelProperty(value = "玻璃类型", position = 8)
			private Integer glassType;

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

			/**
			* 高
			@@ -109,5 +96,24 @@
			@ApiModelProperty(value = "玻璃间隙", position = 15)
			private Integer gap;

			/**
			* 工程号
			*/
			@ApiModelProperty(value = "工程号")
			private String engineerId;

			/**
			* 进片任务
			*/
			@ApiModelProperty(value = "进片任务", position = 16)
			@TableField(exist = false)
			private BigStorageCageFeedTask bigStorageCageFeedTask;

			/**
			* 出片任务
			*/
			@ApiModelProperty(value = "出片任务", position = 17)
			@TableField(exist = false)
			private BigStorageCageOutTask bigStorageCageOutTask;

			}