Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/service/impl/InsOrderQrCodeServiceImpl.java

@@ -118,7 +118,7 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
             Result decode = new MultiFormatReader().decode(binaryBitmap, hints);
             return decode.getText();
         } catch (NotFoundException e) {
-            throw new RuntimeException(e);
+            return  base64;
         }
     }
 
@@ -159,6 +159,7 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
                 }
             } else {
                 //base64 二维码图片
+
                 String qrCodeUrl = getQrCodeUrl(jumlUrl);
                 insOrderQrCode.setJumpUrl(qrCodeUrl);
             }