From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 19:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetType.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetType.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetType.java
index 278dfff..24fb685 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetType.java
@@ -66,7 +66,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
- private Boolean disabled;
+ private Integer disabled;
}
--
Gitblit v1.7.1