From ca6e546a02c7c168263ba057ea51369ba44eb3cc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 11:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 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..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
@@ -1,4 +1,5 @@
package com.mes.temperingglass.entity;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mes.base.entity.BigStorageCageBaseInfo;
@@ -44,12 +45,6 @@
private Integer glassType;
/**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
@@ -80,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,20 +87,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