From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index da8df11..68c8772 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,16 +17,14 @@
@Data
@ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃")
public class WarehouseGoodsShelvesRowcol implements Serializable {
+
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 鏂囨。id
- */
- private Long documentationId;
+
/**
* 灞傛暟
*/
@@ -45,13 +41,9 @@
private Long warehouseGoodsShelvesId;
/**
- * 浠撳簱id
- */
- private Long warehouseId;
-
- /**
* 鍒涘缓鏃堕棿
*/
+
private LocalDateTime createTime;
/**
@@ -62,16 +54,19 @@
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.INSERT)
private Long updateUser;
/**
* 绉熸埛ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 澶囨敞
--
Gitblit v1.9.3