From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetTypeTreeVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetTypeTreeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetTypeTreeVO.java
index 8d9c135..56a6eb8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetTypeTreeVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetTypeTreeVO.java
@@ -52,6 +52,9 @@
@ApiModelProperty(value = "更新人")
private String updateBy;
+ @ApiModelProperty(value = "是否可删除：无子类型且无资产关联时为true")
+ private Boolean canDelete;
+
@ApiModelProperty(value = "子节点列表")
private List<AssetTypeTreeVO> children;
-}
\ No newline at end of file
+}
--
Gitblit v1.7.1