From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java
index 30d8629..bda959e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java
@@ -31,6 +31,9 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "盘点任务ID")
+ private Integer inventoryTaskId;
+
@ApiModelProperty(value = "资产主表ID，关联asset_main表")
@TableField("asset_main_id")
private Integer assetMainId;
@@ -41,15 +44,19 @@
@ApiModelProperty(value = "盘点结果 0-未盘点，1-正常，2-异常")
@TableField("result_status")
- private Boolean resultStatus;
+ private Integer resultStatus;
@ApiModelProperty(value = "实存部门ID")
@TableField("real_dept_id")
private Integer realDeptId;
+ @ApiModelProperty(value = "实存部门名称")
+ @TableField("real_dept_name")
+ private String realDeptName;
+
@ApiModelProperty(value = "实存使用人")
- @TableField("real_user_id")
- private Integer realUserId;
+ @TableField("real_user_name")
+ private String realUserName;
@ApiModelProperty(value = "异常说明")
@TableField("exception_explain")
--
Gitblit v1.7.1