From bf5c42b55da25fbcbb8f92bde539a8e27d800b40 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:16:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java b/TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
index 3d10308..9dcf7eb 100644
--- a/TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
+++ b/TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
@@ -11,7 +11,7 @@
@TableId(type = IdType.AUTO)
private Integer id;//纾ㄨ竟鍓嶇悊鐗囩琛╥d
private Integer flowcard_id;//璁惧id
- private String glass_type;//鏍呮牸鍙�
+ private Integer glass_type;//鏍呮牸鍙�
private String height;//鍚敤鐘舵��
private Integer thickness;//鍓╀綑
--
Gitblit v1.8.0