From 2f78ef164653d5d30732d6e2e3f822a68de63010 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 09:41:39 +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 | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 370e790..0d44f4a 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
@@ -9,7 +9,7 @@
private double glasslength;//鐜荤拑瀹�
private double glassheight;//鐜荤拑楂�
private double glasslengthmm;//鐜荤拑瀹絤m
- private double glassheightmm;//鐜荤拑楂榤m
+ private double glassheightmm;
private String glassoutside;//
private String glassinside;//
@@ -19,6 +19,26 @@
private String datemodified;//
private String datecreated;//
private String FrameBarcode;//
+
+ 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;
@@ -81,7 +101,7 @@
this.glasslengthmm = glasslengthmm;
}
- public Double glassheightmm() {
+ public Double getglassheightmm() {
return glassheightmm;
}
public void setglassheightmm(Double glassheightmm) {
--
Gitblit v1.8.0