From 3acd15a13d9edfde79ee125af135d2a089b23872 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 十一月 2023 15:08:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
index 9ab999d..f66d895 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -2,9 +2,10 @@
public class Glass{
private Integer id;
- private Short orderId;
- private double glassWidth;
- private Short glassId;
+ private String orderId;
+ private double width;
+ private double height;
+ private String glassId;
@@ -18,27 +19,35 @@
return id;
}
- public Short getOrderId() {
+ public String getOrderId() {
return orderId;
}
- public void setOrderId(Short orderId) {
+ public void setOrderId(String orderId) {
this.orderId = orderId;
}
- public double getWidth() {
- return glassWidth;
+ public double getwidth() {
+ return width;
}
- public void setWidth(double glassWidth) {
- this.glassWidth = glassWidth;
+ public void setHeight(double height) {
+ this.height = height;
}
- public Short getGlassId() {
+ public double getHeight() {
+ return height;
+ }
+
+ public void setWidth(double width) {
+ this.width = width;
+ }
+
+ public String getGlassId() {
return glassId;
}
- public void setGlassId(Short glassId) {
+ public void setGlassId(String glassId) {
this.glassId = glassId;
}
--
Gitblit v1.8.0