From b6480bb8991e83a2efd5e4835ccc8ed0e87c067a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 22 七月 2024 14:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 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 02e9750..120a0d1 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,7 @@
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;
@@ -20,7 +20,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 +30,6 @@
@ApiModelProperty(value = "閽㈠寲灏忕墖淇℃伅琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
- /**
- * 鐜荤拑id
- */
- @ApiModelProperty(value = "鐜荤拑id", position = 3)
- private String glassId;
/**
* 娴佺▼鍗�
@@ -50,28 +44,22 @@
private Integer glassType;
/**
- * 瀹�
- */
- @ApiModelProperty(value = "瀹�", position = 6)
- private Double width;
-
- /**
* 楂�
*/
@ApiModelProperty(value = "楂�", position = 7)
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
- private Double thickness;
+ private double thickness;
/**
* 鑶滅郴
*/
@ApiModelProperty(value = "鑶滅郴", position = 9)
- private Integer filmsid;
+ private String filmsid;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -114,10 +102,10 @@
*/
@ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
+
/**
- * 鏍煎瓙鍙�
+ * 宸ョ▼id
*/
- private Integer slot;
-
-
+ @ApiModelProperty(value = "宸ョ▼id", position = 17)
+ private String engineerId;
}
--
Gitblit v1.8.0