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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 24579c0..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
@@ -3,8 +3,8 @@
public class Glass{
private Integer id;
private String orderId;
- private double glassWidth;
- private double glassHeight;
+ private double width;
+ private double height;
private String glassId;
@@ -27,20 +27,20 @@
this.orderId = orderId;
}
- public double getWidth() {
- return glassWidth;
+ public double getwidth() {
+ return width;
}
- public void setHeight(double glassHeight) {
- this.glassHeight = glassHeight;
+ public void setHeight(double height) {
+ this.height = height;
}
public double getHeight() {
- return glassHeight;
+ return height;
}
- public void setWidth(double glassWidth) {
- this.glassWidth = glassWidth;
+ public void setWidth(double width) {
+ this.width = width;
}
public String getGlassId() {
--
Gitblit v1.8.0