From ddf7bfc1a172d3ad52f9ae0a728e91d405f2dd49 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 14:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 66a5c48..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
@@ -2,13 +2,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,7 +25,7 @@
/**
* 涓婄墖宸ヤ綅琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
@@ -54,7 +56,7 @@
/**
* 鍘熺墖楂�
*/
- private Double patternHeigth;
+ private Double patternHeight;
/**
* 鍘熺墖鍘氬害
@@ -64,7 +66,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 鏁伴噺
--
Gitblit v1.8.0