From 0a67d6a24417507a27e03d53da82bbd802257148 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 19 Jan 2021 02:20:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |    1 +
 1 files changed, 1 insertions(+), 0 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 5c5735f..dfd5149 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
@@ -47,6 +47,7 @@
  * @author wzy
  * @date 2020-12-21
  **/
+@CrossOrigin(origins = "*")
 @Api(value = "CommonAction", tags = "手机端公共请求类(含登陆)")
 @RestController
 @RequestMapping(value = "/api/common")

--
Gitblit v1.9.1