From 254899911b6ca9b2e6085060902990cff8c84ef0 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 27 十月 2023 16:33:19 +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 | 6 +++---
1 files changed, 3 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 7324151..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
@@ -5,7 +5,7 @@
private Short orderId;
private double glassWidth;
private double glassHeight;
- private Short glassId;
+ private String glassId;
@@ -43,11 +43,11 @@
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