Merge remote-tracking branch 'origin/master'

mitao

1 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/java/com/ruoyi/system/vo/GrabDetailVO.java

@@ -33,8 +33,7 @@
    private String title;
    @ApiModelProperty(value = "资产类型名称")
    private String assetTypeName;
    @ApiModelProperty(value = "领用资产列表")
    private PageInfo<GrabListVO> grabListVOPageInfo;

    @ApiModelProperty(value = "审批流程")
    private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;