From 9908b4b940ba64baef1f91e53736cf0fd4f38f46 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 11 Mar 2018 11:14:16 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/util/QRCodeUtils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/util/QRCodeUtils.java b/boot-service/src/main/java/com/xwbing/util/QRCodeUtils.java
index d866eed..59e40d7 100644
--- a/boot-service/src/main/java/com/xwbing/util/QRCodeUtils.java
+++ b/boot-service/src/main/java/com/xwbing/util/QRCodeUtils.java
@@ -188,7 +188,7 @@ public class QRCodeUtils {
          *
          * @param bitMatrix
          */
-        private InputStream addMaterial(BitMatrix bitMatrix) {
+        private void addMaterial(BitMatrix bitMatrix) {
             try {
                 BufferedImage image = toBufferedImage(bitMatrix);
                 //计算高宽
@@ -199,10 +199,10 @@ public class QRCodeUtils {
                 image = position_text(image);
                 //生成二维码
                 output(image);
-                return bufferImage_to_InputStream(image);
+//                return bufferImage_to_InputStream(image);
             } catch (IOException e) {
                 e.printStackTrace();
-                return null;
+//                return null;
             }
         }