From 1e862ae4a11072451fa9b0449f13f48c0d98e91d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 10:06:12 +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 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 2ebf5a8..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
@@ -1,5 +1,4 @@
 package com.mes.temperingglass.entity;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.mes.base.entity.BigStorageCageBaseInfo;
@@ -48,13 +47,13 @@
      * 楂�
      */
     @ApiModelProperty(value = "楂�", position = 7)
-    private Double height;
+    private double height;
 
     /**
      * 鍘氬害
      */
     @ApiModelProperty(value = "鍘氬害", position = 8)
-    private Double thickness;
+    private double thickness;
 
     /**
      * 鑶滅郴
@@ -104,4 +103,9 @@
     @ApiModelProperty(value = "鐘舵��", position = 16)
     private Integer state;
 
+    /**
+     * 宸ョ▼id
+     */
+    @ApiModelProperty(value = "宸ョ▼id", position = 17)
+    private String engineerId;
 }

--
Gitblit v1.8.0