From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index b491ac3..2e2843d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -1,5 +1,5 @@
package com.example.springboot.entity;
-
+//瀹㈡埛鐜荤拑淇℃伅琛�
public class north_glass_buffer1 {
private Integer id; //鑷id
private String ordernumber;//璁㈠崟id
@@ -9,16 +9,16 @@
private double glasslength;//鐜荤拑瀹�
private double glassheight;//鐜荤拑楂�
private double glasslengthmm;//鐜荤拑瀹絤m
- private double glassheightmm;
+ private double glassheightmm;//鐜荤拑楂榤m
private String glassoutside;//
private String glassinside;//
private String glassbetween;//
private String itemtype;//
- private String slotnumber;//
+ private String slotnumber;//鏍煎瓙
private String datemodified;//
private String datecreated;//
- private String FrameBarcode;//
+ private String FrameBarcode;//閾濇id
private StorageCage storageCage;
@@ -102,7 +102,7 @@
}
public Double getglassheightmm() {
- return glasslengthmm;
+ return glassheightmm;
}
public void setglassheightmm(Double glassheightmm) {
this.glassheightmm = glassheightmm;
--
Gitblit v1.8.0