From bdd967acce69d2420d9866789dfcee42c7e77023 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 14:10:44 +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