From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:12:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
index 568facc..1c5e3af 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -1,6 +1,5 @@
package com.example.springboot.entity;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,18 +7,21 @@
@Data
@TableName("`glassinfo`")
-public class glassinfo {
+public class GlassInfo {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
private Integer glasstype;// 鐜荤拑绫诲瀷
private Integer mateid;// 閰嶇墖id
- private Integer glassid;// 鐜荤拑id
+ private String glassid;// 鐜荤拑id
private Integer tier;// 灞�
private String films;// 鑶滅郴
private Double width;// 瀹�
private Double height;// 楂�
- private String thickness;// 鍘�
+ private Double thickness;// 鍘�
private Integer number;// 鏁伴噺
private Integer finishnumber;// 瀹屾垚鏁伴噺
-
+ private Integer sumtier;// 瀹屾垚鏁伴噺
+ private Integer measurenumber;// 娴嬮噺瀹屾垚鏁伴噺
+ private Integer cageno;//绗煎唴鏁伴噺
+ private Integer method;//鍑虹墖鏂瑰紡
}
--
Gitblit v1.8.0