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/WarehouseGoodsShelves.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index d39f59d..d267986 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.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;
@@ -28,16 +26,18 @@
     /**
      * 璐ф灦鍚嶇О
      */
-    private String goodsShelvesName;
+    private String name;
     /**
      * 灞傛暟
      */
-    private Long storey;
+    @TableField("`row`")
+    private Long row;
 
     /**
      * 鍒楁暟
      */
-    private Long arrange;
+    @TableField("`col`")
+    private Long col;
 
     /**
      * 浠撳簱id
@@ -47,28 +47,33 @@
     /**
      * 鍒涘缓鏃堕棿
      */
+    @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_UPDATE)
+    private Integer updateUser;
 
     /**
      * 绉熸埛ID
      */
+
+    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

--
Gitblit v1.9.3