From c407e091ff0320625ef2566a4bea362c697200c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
index b871250..8f0cea5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -1,13 +1,14 @@
package com.mes.downglassinfo.entity;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.stereotype.Component;
+import java.io.Serializable;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,12 +24,18 @@
/**
* 涓嬬墖鐜荤拑淇℃伅琛╥d
*/
- private int id;
+
+ private Long id;
/**
* 娴佺▼鍗″彿
*/
private String flowCardId;
+
+ /**
+ * 灞傚彿
+ */
+ private Integer layer;
/**
* 椤哄簭
@@ -50,8 +57,15 @@
*/
private Double thickness;
-
+ /**
+ * 鑶滅郴
+ */
private String Filmsid;
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
+
}
--
Gitblit v1.8.0