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 | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java index ebe14b5..d267986 100644 --- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java +++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java @@ -26,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 @@ -52,7 +54,7 @@ * 鍒涘缓鐢ㄦ埛 */ @TableField(fill = FieldFill.INSERT) - private Long createUser; + private Integer createUser; /** * 淇敼鏃堕棿 @@ -64,7 +66,7 @@ * 淇敼鐢ㄦ埛 */ @TableField(fill = FieldFill.INSERT_UPDATE) - private Long updateUser; + private Integer updateUser; /** * 绉熸埛ID -- Gitblit v1.9.3