From f4df0b5c294e598846dd565906d5027a7c043f25 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 18 七月 2024 15:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index ac47c7b..d3d7b75 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -1,7 +1,9 @@
package com.mes.temperingglass.entity;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.base.entity.BigStorageCageBaseInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,88 +15,92 @@
* </p>
*
* @author zhoush
- * @since 2024-04-07
+ * @since 2024-03-27
*/
+@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;
/**
* 閽㈠寲灏忕墖淇℃伅琛╥d
*/
+ @ApiModelProperty(value = "閽㈠寲灏忕墖淇℃伅琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 娴佺▼鍗�
*/
- private String flowcardId;
+ @ApiModelProperty(value = "娴佺▼鍗�", position = 4)
+ private String flowCardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
+ @ApiModelProperty(value = "娴佺▼鍗＄幓鐠冪被鍨�", position = 5)
private Integer glassType;
-
- /**
- * 瀹�
- */
- private Double width;
/**
* 楂�
*/
- private Double height;
+ @ApiModelProperty(value = "楂�", position = 7)
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ @ApiModelProperty(value = "鍘氬害", position = 8)
+ private double thickness;
/**
* 鑶滅郴
*/
- private Integer filmsid;
+ @ApiModelProperty(value = "鑶滅郴", position = 9)
+ private String filmsid;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
*/
+ @ApiModelProperty(value = "閽㈠寲鏄惁鎺ュ彈妯斁", position = 10)
private Integer ishorizontal;
/**
* 閽㈠寲鐗堝浘id
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 11)
private Integer temperingLayoutId;
/**
* 閽㈠寲鐗堝浘鐗囧簭
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 12)
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)
private Integer angle;
/**
* 鐘舵��
*/
+ @ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
- /**
- * 鏍煎瓙鍙�
- */
- private Integer slot;
-
}
--
Gitblit v1.8.0