Merge branch 'api' into order_reform

wzy

2021-01-10 16da0ad1fda1dffa3019425a6887d38ed4217f44

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

@@ -122,7 +122,7 @@
        LogUtil.info("fileName : {}", fileName);

        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
        ajaxResult.putInMap("file", fileName);
        ajaxResult.putInMap("file", saveUrl + fileName);
        return ajaxResult;
    }