From f9e66cff47f775ea48181ea8cd96b1550f7840b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:18:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index 97842af..638e8c7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -8,8 +8,28 @@
private String barcode;//鐜荤拑id
private double glasslength;//鐜荤拑瀹�
private double glassheight;//鐜荤拑楂�
- private double glasslength_mm;//鐜荤拑瀹絤m
- private double glassheight_mm;//鐜荤拑楂榤m
+ private double glasslengthMm;//鐜荤拑瀹絤m
+ private double glassheightMm;//鐜荤拑楂榤m
+
+ private StorageCage storageCage;
+
+ public void setstorageCage(StorageCage storageCage) {
+ this.storageCage = storageCage;
+ }
+
+ public StorageCage getstorageCage() {
+ return storageCage;
+ }
+
+ private Out_slice out_slice;
+
+ public void setOut_slice(Out_slice out_slice) {
+ this.out_slice = out_slice;
+ }
+
+ public Out_slice getOut_slice() {
+ return out_slice;
+ }
public Integer id() {
return id;
@@ -65,18 +85,18 @@
this.glassheight = glassheight;
}
- public Double getglasslength_mm() {
- return glasslength_mm;
+ public Double getglasslengthMm() {
+ return glasslengthMm;
}
- public void setglasslength_mm(Double glasslength_mm) {
- this.glasslength_mm = glasslength_mm;
+ public void setglasslengthMm(Double glasslengthMm) {
+ this.glasslengthMm = glasslengthMm;
}
- public Double glassheight_mm() {
- return glassheight_mm;
+ public Double getglassheightMm() {
+ return glassheightMm;
}
- public void setglassheight_mm(Double glassheight_mm) {
- this.glassheight_mm = glassheight_mm;
+ public void setglassheight_mm(Double glassheightMm) {
+ this.glassheightMm = glassheightMm;
}
--
Gitblit v1.8.0