From 2aa0dd9c34c6be86e70b1d2d939d3660552cb514 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 九月 2025 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryRecord.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryRecord.java
index 80682ab..2df7126 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryRecord.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -35,13 +36,35 @@
@TableField("asset_main_id")
private Integer assetMainId;
+ @ApiModelProperty(value = "仓库ID")
+ @TableField("warehouse_id")
+ private Integer warehouseId;
+
@ApiModelProperty(value = "出入库类型 0-入库，1-出库")
@TableField("type")
- private Boolean type;
+ private Integer type;
@ApiModelProperty(value = "备注(记录出入库类型，如资产入库、借用、借用归还、资产变更、领用、盘点、处置等)")
@TableField("remarks")
private String remarks;
+ @ApiModelProperty(value = "创建时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+ @ApiModelProperty(value = "创建人")
+ @TableField("create_by")
+ private String createBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField("update_time")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "更新人")
+ @TableField("update_by")
+ private String updateBy;
+
+ @ApiModelProperty(value = "是否删除 0-否，1-是")
+ @TableField("disabled")
+ private Boolean disabled;
}
--
Gitblit v1.7.1