From c823892f961b266199731ddd365d2dd4af4bf382 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 08:50:27 +0800
Subject: [PATCH] 1、中空线初步版本,待优化 2、fixbug 钢化后摆片顺序错乱

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 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 9a83681..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;
@@ -63,22 +64,21 @@
     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鍧愭爣
+     */
+    @ApiModelProperty(value = "x鍧愭爣", position = 13)
+    private Integer xCoordinate;
+
+    /**
+     * y鍧愭爣
+     */
+    @ApiModelProperty(value = "y鍧愭爣", position = 14)
+    private Integer yCoordinate;
 
     /**
      * 鐘舵��
@@ -86,9 +86,7 @@
     @ApiModelProperty(value = "鐘舵��", position = 16)
     private Integer state;
 
-    /**
-     * 宸ョ▼id
-     */
-    @ApiModelProperty(value = "宸ョ▼id", position = 17)
-    private String engineerId;
+
+    @TableLogic
+    private int deleted;
 }

--
Gitblit v1.8.0