From 1c26bd4ac7453b5f4a29f0e428893b5247a8fde8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十月 2023 10:18:57 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..1dad942 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
@@ -4,7 +4,8 @@
private Integer id;
private Short orderId;
private double glassWidth;
- private Short glassId;
+ private double glassHeight;
+ private String glassId;
@@ -30,15 +31,23 @@
return glassWidth;
}
+ public void setHeight(double glassHeight) {
+ this.glassHeight = glassHeight;
+ }
+
+ public double getHeight() {
+ return glassHeight;
+ }
+
public void setWidth(double glassWidth) {
this.glassWidth = glassWidth;
}
- public Short getGlassId() {
+ public String getGlassId() {
return glassId;
}
- public void setGlassId(Short glassId) {
+ public void setGlassId(String glassId) {
this.glassId = glassId;
}
--
Gitblit v1.8.0