From 904bd3f366c32dc5a8a6f092fe1fec192d40fac0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 18:11:36 +0800
Subject: [PATCH] Merge branch 'api' into order_reform

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 6e8f83a..e353f19 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/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;
     }
 

--
Gitblit v1.9.1