From 03587b58b343956f910a653c37b9a7bcd84e4af9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 18:54:03 +0800
Subject: [PATCH] 资产管理-资产领用列表 阿里云OSS文件上传
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 325f511..d557b64 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;
@@ -64,7 +68,7 @@
@ApiModelProperty(value = "资产主类型：0-通用资产，1-房产资产，2-车辆资产")
@TableField("asset_main_type")
- private Boolean assetMainType;
+ private Integer assetMainType;
@ApiModelProperty(value = "计量单位")
@TableField("measurement_unit")
@@ -142,6 +146,19 @@
@TableField("attachment_urls")
private String attachmentUrls;
+ @ApiModelProperty(value = "是否被处置")
+ @TableField("is_disposed")
+ private Integer disposed;
+
+ @ApiModelProperty(value = "是否借用未归还")
+ @TableField("is_borrowed")
+ private Integer borrowed;
+
+ @ApiModelProperty(value = "是否被领用")
+ @TableField("is_in_use")
+ private Integer inUse;
+
+
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
--
Gitblit v1.7.1