From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 15 ++++++++++++++-
1 files changed, 14 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..1cc1695 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
@@ -64,7 +64,7 @@
@ApiModelProperty(value = "资产主类型：0-通用资产，1-房产资产，2-车辆资产")
@TableField("asset_main_type")
- private Boolean assetMainType;
+ private Integer assetMainType;
@ApiModelProperty(value = "计量单位")
@TableField("measurement_unit")
@@ -142,6 +142,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