From ab0ad84b5c577036f9ed5b53d2e90e81e5ba3de9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 九月 2025 20:32:13 +0800
Subject: [PATCH] Merge branch 'feature_asset'

---
 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