From 030201887b4690e20b1f9ffae548ccd840e7077f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 九月 2025 15:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 9 +++++++--
1 files changed, 7 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 d557b64..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
@@ -76,7 +76,7 @@
@ApiModelProperty(value = "数量")
@TableField("quantity")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
@TableField("unit_price")
@@ -97,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")
@@ -158,7 +161,6 @@
@TableField("is_in_use")
private Integer inUse;
-
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@@ -179,5 +181,8 @@
@TableField("disabled")
private Boolean disabled;
+ @ApiModelProperty(value = "使用部门/位置")
+ @TableField(exist = false)
+ private String useDeptOrLocation;
}
--
Gitblit v1.7.1