From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 8ca68d0..1594efb 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -16,6 +16,7 @@
 import com.zy.asrs.entity.MatCodePrint;
 import com.zy.asrs.service.MatCodeService;
 import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
 import com.zy.common.utils.BarcodeUtils;
 import com.zy.common.utils.QrCode;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
@@ -183,6 +184,7 @@
     public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                         , @RequestParam String param
                         , HttpServletResponse response) throws Exception {
+        AdminInterceptor.cors(response);
         if (Cools.isEmpty(param)){
             return R.parse(BaseRes.EMPTY);
         }

--
Gitblit v1.9.1