Merge remote-tracking branch 'origin/master'

3 days ago · 7f55367ac2
parent 125ce9df9c 303238f0de
commit 7f55367ac2
1 changed files with 1 additions and 0 deletions
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java
@ -30,6 +30,7 @@ public class OemStatementApprovalServiceImpl implements ApprovalRecordDetailStra
        List<OemSettlementApprovalDetailVO> oc = oemSettlementApprovalService.getApprovalDetailList(bizId, true);
        List<OemSettlementApprovalDetailVO> ocCategory = oemSettlementApprovalService.getApprovalDetailList(bizId, false);
        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("approvalId", bizId);
        resultMap.put("oc", oc);
        resultMap.put("ocCategory", ocCategory);
        return resultMap;