From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
index 1cc1695..2d7def2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
@@ -54,6 +54,10 @@
@TableField("specification_model")
private String specificationModel;
+ @ApiModelProperty(value = "类别")
+ @TableField("category")
+ private String category;
+
@ApiModelProperty(value = "资产类别ID，关联asset_type表")
@TableField("asset_type_id")
private Integer assetTypeId;
@@ -72,7 +76,7 @@
@ApiModelProperty(value = "数量")
@TableField("quantity")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
@TableField("unit_price")
@@ -93,6 +97,9 @@
@ApiModelProperty(value = "使用人")
@TableField("user_name")
private String userName;
+
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
@ApiModelProperty(value = "使用部门/位置ID")
@TableField("use_dept_id")
@@ -154,7 +161,6 @@
@TableField("is_in_use")
private Integer inUse;
-
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@@ -175,5 +181,8 @@
@TableField("disabled")
private Boolean disabled;
+ @ApiModelProperty(value = "使用部门/位置")
+ @TableField(exist = false)
+ private String useDeptOrLocation;
}
--
Gitblit v1.7.1