Merge remote-tracking branch 'origin/master'

chenjiahe

2023-10-08 e96b0d2ac2d14a1035e91cf221f5ecd764980e16

 src/main/java/com/hx/util/QRCodeUtil.java

@@ -55,7 +55,7 @@
         bos = new ByteArrayOutputStream();
         ImageIO.write(image, "JPEG", bos);
         byte[] buf = bos.toByteArray();
         return Base64.getEncoder().encodeToString(buf);
         return "data:image/png;base64,"+Base64.getEncoder().encodeToString(buf);
      }catch (Exception e){
         e.printStackTrace();
      }finally {