From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index 68c8772..f2a0daa 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="warehouse_goods_shelves_rowcol")
@Data
-@ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃")
+@Schema(name = "浠撳簱璐ф灦灞傦紝鍒楄〃")
public class WarehouseGoodsShelvesRowcol implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,12 +28,14 @@
/**
* 灞傛暟
*/
- private Long storey;
+ @TableField("`row`")
+ private Long row;
/**
* 鍒楁暟
*/
- private Long arrange;
+ @TableField("`col`")
+ private Long col;
/**
* 璐ф灦id
@@ -43,13 +45,14 @@
/**
* 鍒涘缓鏃堕棿
*/
-
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 鍒涘缓鐢ㄦ埛
*/
- private Long createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
/**
* 淇敼鏃堕棿
@@ -61,7 +64,7 @@
* 淇敼鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long updateUser;
+ private Integer updateUser;
/**
* 绉熸埛ID
@@ -73,4 +76,7 @@
*/
private String remark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
--
Gitblit v1.9.3