Merge remote-tracking branch 'origin/master'

mitao

9 小时以前 95d8e5f4348497b1eee5884086534c86b1661b4f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java

@@ -650,6 +650,7 @@
                            saveAssetRecord(0,ApprovalTypeEnum.RETURN.getDesc(),back.stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
                                    .collect(Collectors.toList()));

                            break;
                        case 10:
                            OaApprovalApplicationDispose approvalApplicationDispose = approvalApplicationDisposeService.lambdaQuery()
                                    .eq(OaApprovalApplicationDispose::getApprovalApplicationId, approvalApplications.getId())