From 86dbb4e751bb5c4990d082a070d409ee75ed3745 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 12 六月 2024 09:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 546b6a7..ed0bc83 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
@@ -55,7 +55,7 @@
/**
* 鍘熺墖楂�
*/
- private Double patternHeigth;
+ private Double patternHeight;
/**
* 鍘熺墖鍘氬害
@@ -65,7 +65,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 鏁伴噺
--
Gitblit v1.8.0