From 0496f6d9fa11ccc0acb8892d4739c7a9661ba081 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 02 八月 2024 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 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 2ebf5a8..9a83681 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
@@ -45,16 +45,10 @@
private Integer glassType;
/**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private Double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
- private Double thickness;
+ private double thickness;
/**
* 鑶滅郴
@@ -81,18 +75,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)
@@ -104,4 +86,9 @@
@ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
+ /**
+ * 宸ョ▼id
+ */
+ @ApiModelProperty(value = "宸ョ▼id", position = 17)
+ private String engineerId;
}
--
Gitblit v1.8.0