From c7b4647fbcebf9a097a948110ca9a195827ac430 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 13 五月 2024 11:00:43 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java index 76f2923..b5265de 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java @@ -56,7 +56,7 @@ /** * 鍘熺墖楂� */ - private Double patternHeigth; + private Double patternHeight; /** * 鍘熺墖鍘氬害 @@ -66,7 +66,7 @@ /** * 鑶滅郴 */ - private Integer filmsId; + private String filmsId; /** * 鏁伴噺 -- Gitblit v1.8.0