Merge remote-tracking branch 'origin/master'

mitao

1 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

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

@@ -38,8 +38,7 @@
    private Integer disposeType;
    @ApiModelProperty(value = "处置总金额（元）")
    private BigDecimal disposeTotalAmount;
    @ApiModelProperty(value = "处置资产列表")
    private PageInfo<GrabListVO> grabListVOPageInfo;

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