Merge remote-tracking branch 'origin/master'

mitao

3 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

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