From 119baa8e4d47b8af6117dd0bbe35fd1755504ee1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 22:20:03 +0800
Subject: [PATCH] 1、卧理不同界面报破损功能优化 2、大理片笼新增按照钢化版图查询笼内玻璃信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 30 ++++++++----------------------
1 files changed, 8 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 d3d7b75..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
@@ -1,6 +1,8 @@
package com.mes.temperingglass.entity;
+
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;
@@ -44,12 +46,6 @@
private Integer glassType;
/**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
@@ -68,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鍧愭爣
*/
@@ -92,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