From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期一, 22 四月 2024 16:38:26 +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 | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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..74f6cce 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; /** @@ -64,7 +66,7 @@ /** * 鑶滅郴 */ - private Integer filmsId; + private String filmsId; /** * 鏁伴噺 -- Gitblit v1.8.0