From b33e6f53dd537abaebad066de12474580fcc33b2 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期四, 21 八月 2025 15:03:14 +0800 Subject: [PATCH] Merge branch 'pim_ywx' --- src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java index 60c255d..4372314 100644 --- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java +++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java @@ -1,9 +1,7 @@ package com.ruoyi.warehouse.pojo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; @@ -19,6 +17,7 @@ @Data @ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃") public class WarehouseGoodsShelvesRowcol implements Serializable { + private static final long serialVersionUID = 1L; /** * @@ -29,12 +28,14 @@ /** * 灞傛暟 */ - private Long storey; + @TableField("`row`") + private Long row; /** * 鍒楁暟 */ - private Long arrange; + @TableField("`col`") + private Long col; /** * 璐ф灦id @@ -44,26 +45,31 @@ /** * 鍒涘缓鏃堕棿 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 鍒涘缓鐢ㄦ埛 */ - private Long createUser; + @TableField(fill = FieldFill.INSERT) + private Integer createUser; /** * 淇敼鏃堕棿 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; /** * 淇敼鐢ㄦ埛 */ - private Long updateUser; + @TableField(fill = FieldFill.INSERT) + private Integer updateUser; /** * 绉熸埛ID */ + @TableField(fill = FieldFill.INSERT) private Long tenantId; /** * 澶囨敞 -- Gitblit v1.9.3