Merge remote-tracking branch 'origin/master'

mitao

2 天以前 28f9605441cdda5bd9cfabd2241ff8509a4a8888

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

@@ -39,7 +39,8 @@
    private Integer disposeType;
    @ApiModelProperty(value = "处置总金额（元）")
    private BigDecimal disposeTotalAmount;

    @ApiModelProperty(value = "是否可以审批")
    private Boolean isAudit;
    @ApiModelProperty(value = "审批流程")
    private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;