From a8d31b3d7b6e0d60b8045ace9be49cdfb590696f Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期四, 09 十一月 2023 15:46:37 +0800
Subject: [PATCH] 拉取后对应翻译没了，部分代码报错，修改后提交
---
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 120 ++++++++++++++---------------------------------------------
1 files changed, 29 insertions(+), 91 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 3810150..2c952ab 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
@@ -2,44 +2,38 @@
public class StorageCage {
private Integer id;
+ private Integer prcId;
private String glassId;
-<<<<<<< HEAD
private Integer cage;
private Integer cell;
private Double width;
private Double glasswidth;
private Double glassheight;
private String state;
- private Integer tier;
+ 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
+ private Integer disabled;
+ private String lengthWidth;
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;
}
+ public Integer getPrcId() {
+ return prcId;
+ }
+
+ public void setPrcId(Integer prcId) {
+ this.prcId = prcId;
+ }
+
public String getGlassId() {
return glassId;
@@ -48,15 +42,15 @@
public void setGlassId(String glassId) {
this.glassId = glassId;
}
-<<<<<<< HEAD
- public String getOrderId() {
+
+ public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
-
+
public Integer getCage() {
return cage;
}
@@ -73,16 +67,6 @@
return cell;
}
-
-
- // public String getHeighth() {
- // return height;
- // }
-
- // public void setHeight(String height) {
- // this.height = height;
- // }
-
public Double getWidth() {
return width;
}
@@ -91,43 +75,7 @@
this.width = width;
}
- 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;
}
@@ -135,53 +83,43 @@
this.state = state;
}
-<<<<<<< HEAD
- public Integer getTier() {
+ public Integer getTier() {
return tier;
}
public void setTier(Integer tier) {
this.tier = tier;
}
- public Double getGlassWidth() {
+
+ 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;
}
-
-=======
- public String getTier() {
- return tier;
+
+ public Integer getDisabled() {
+ return disabled;
}
- public void setTier(String tier) {
- this.tier = tier;
+ public void setDisabled(Integer disabled) {
+ this.disabled = disabled;
}
- public Double getglasswidth() {
- return glasswidth;
+ public String getLengthWidth() {
+ return lengthWidth;
}
- public void setglasswidth(Double glasswidth) {
- this.glasswidth = glasswidth;
+ public void setLengthWidth(String lengthWidth) {
+ this.lengthWidth = lengthWidth;
}
-
- public Double getglassheight() {
- return glassheight;
- }
-
- public void setglassheight(Double glassheight) {
- this.glassheight = glassheight;
- }
-
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
}
--
Gitblit v1.8.0