From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +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 |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 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..370e790 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,17 @@
     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 String glassoutside;//
+    private String glassinside;//
+    private String glassbetween;//
+    private String itemtype;//
+    private String slotnumber;//
+    private String datemodified;//
+    private String datecreated;//
+    private String FrameBarcode;//
 
     public Integer id() {
         return id;
@@ -65,20 +74,50 @@
         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 glassheightmm() {
+        return glassheightmm;
     }
-    public void setglassheight_mm(Double glassheight_mm) {
-        this.glassheight_mm = glassheight_mm;
+    public void setglassheightmm(Double glassheightmm) {
+        this.glassheightmm = glassheightmm;
     }
 
+    public String getitemtype() {
+        return itemtype;
+    }
+    public void setitemtype(String itemtype) {
+        this.itemtype = itemtype;
+    }
+    public String getslotnumber() {
+        return slotnumber;
+    }
+    public void setslotnumber(String slotnumber) {
+        this.slotnumber = slotnumber;
+    }
+    public String getdatemodified() {
+        return datemodified;
+    }
+    public void setdatemodified(String datemodified) {
+        this.datemodified = datemodified;
+    }
+    public String getdatecreated() {
+        return datecreated;
+    }
+    public void setdatecreated(String datecreated) {
+        this.datecreated = datecreated;
+    }
+    public String getFrameBarcode() {
+        return FrameBarcode;
+    }
+    public void setFrameBarcode(String FrameBarcode) {
+        this.FrameBarcode = FrameBarcode;
+    }
    
 
 }
\ No newline at end of file

--
Gitblit v1.8.0