From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java index 8b60c17..36204b8 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java @@ -1,5 +1,6 @@ package com.mes.rawglassdetails.entity.request; +import com.mes.userinfo.entity.vo.SysUserVO; import lombok.Data; /** @@ -8,7 +9,7 @@ * @Description: */ @Data -public class RawGlassRequest { +public class RawGlassRequest extends SysUserVO { /** * 鍘熺墖瀹� @@ -38,5 +39,5 @@ /** * 鏍呮牸鍙� */ - private Integer slot; + private String slotId; } -- Gitblit v1.8.0