From baef763e1319d58eda668a5cac6edd8a150defd8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 05 九月 2023 17:00:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 4a05577..3810150 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -3,6 +3,7 @@
 public class StorageCage {
     private Integer id;
     private String glassId;
+<<<<<<< HEAD
     private Integer cage;
     private Integer cell;
     private Double width;
@@ -11,13 +12,31 @@
     private String state;
     private Integer tier;  
     private String orderId;
+=======
+    private String orderid;
+    private String cage;
+    private String cell;
+    private String width;
+    private String state;
+    private String tier;
+    private Double glasswidth;
+    private Double glassheight;
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
 
     public Integer id() {
         return id;
     }
+<<<<<<< HEAD
     public void setId(Integer id) {
         this.id = id;
     }
+=======
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
     public Integer getId() {
         return id;
     }
@@ -29,6 +48,7 @@
     public void setGlassId(String glassId) {
         this.glassId = glassId;
     }
+<<<<<<< HEAD
      public String getOrderId() {
         return orderId;
     }
@@ -72,6 +92,42 @@
     }
 
      public String getState() {
+=======
+
+    public String getOrderId() {
+        return orderid;
+    }
+
+    public void setOrderId(String orderid) {
+        this.orderid = orderid;
+    }
+
+    public String getCage() {
+        return cage;
+    }
+
+    public void setGage(String cage) {
+        this.cage = cage;
+    }
+
+    public void setCell(String cell) {
+        this.cell = cell;
+    }
+
+    public String getCell() {
+        return cell;
+    }
+
+    public String getWidth() {
+        return width;
+    }
+
+    public void setWidth(String width) {
+        this.width = width;
+    }
+
+    public String getState() {
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
         return state;
     }
 
@@ -79,6 +135,7 @@
         this.state = state;
     }
 
+<<<<<<< HEAD
       public Integer getTier() {
         return tier;
     }
@@ -101,4 +158,30 @@
         this.glassheight = glassheight;
     }
   
+=======
+    public String getTier() {
+        return tier;
+    }
+
+    public void setTier(String tier) {
+        this.tier = tier;
+    }
+
+    public Double getglasswidth() {
+        return glasswidth;
+    }
+
+    public void setglasswidth(Double glasswidth) {
+        this.glasswidth = glasswidth;
+    }
+
+    public Double getglassheight() {
+        return glassheight;
+    }
+
+    public void setglassheight(Double glassheight) {
+        this.glassheight = glassheight;
+    }
+
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
 }

--
Gitblit v1.8.0