From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 62c122f..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
@@ -50,9 +50,13 @@
@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