From 7138440c99b0d914982a10f1345ad1d4eb4f296f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 24 七月 2024 08:29:42 +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 | 14 +-------------
1 files changed, 1 insertions(+), 13 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 0da9c7d..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
@@ -104,20 +104,8 @@
private Integer state;
/**
- * 鏍煎瓙
- */
- @ApiModelProperty(value = "鏍煎瓙", position = 17)
- private Integer slot;
-
- /**
- * 閽㈠寲绫诲瀷
- */
- @ApiModelProperty(value = "閽㈠寲绫诲瀷", position = 17)
- private Integer temperingType;
-
- /**
* 宸ョ▼id
*/
@ApiModelProperty(value = "宸ョ▼id", position = 17)
- private Integer engineerId;
+ private String engineerId;
}
--
Gitblit v1.8.0