From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +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 | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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..b491ac3 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,8 +101,8 @@
this.glasslengthmm = glasslengthmm;
}
- public Double glassheightmm() {
- return glassheightmm;
+ public Double getglassheightmm() {
+ return glasslengthmm;
}
public void setglassheightmm(Double glassheightmm) {
this.glassheightmm = glassheightmm;
--
Gitblit v1.8.0