Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-04 58ee87fd64efdb75d16e396c3d952d3522c3a747

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java

@@ -290,7 +290,7 @@
      // 二维码流
      InputStream erCodeStream = null;
      try {
         erCodeStream = QRCodeUtil.getInstance(250).encode(erCodeUrl);
         erCodeStream = QRCodeUtil.getInstance(250).encodeDeleteWhite(erCodeUrl);
      } catch (Exception e1) {
         e1.printStackTrace();
      }