From 13060b4204c022eb7393a4917966ef7d592ef7a5 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 24 六月 2024 21:38:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 3 +-- 1 files changed, 1 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 74f6cce..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 @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode; @@ -56,7 +55,7 @@ /** * 鍘熺墖楂� */ - private Double patternHeigth; + private Double patternHeight; /** * 鍘熺墖鍘氬害 -- Gitblit v1.8.0