From 16bc036b693e98f854210499641beb0eac80c760 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 05 十二月 2024 14:36:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 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 63b0c45..a61d9a6 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.mes.base.entity.BigStorageCageBaseInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -45,12 +46,6 @@
private Integer glassType;
/**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
@@ -69,17 +64,10 @@
private Integer ishorizontal;
/**
- * 閽㈠寲鐗堝浘id
+ * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
- @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 11)
- private Integer temperingLayoutId;
-
- /**
- * 閽㈠寲鐗堝浘鐗囧簭
- */
- @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 12)
- private Integer temperingFeedSequence;
-
+ @ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 15)
+ private Integer angle;
/**
* x鍧愭爣
*/
@@ -93,15 +81,12 @@
private Integer yCoordinate;
/**
- * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
- */
- @ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 15)
- private Integer angle;
-
- /**
* 鐘舵��
*/
@ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
+
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0