Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/alipay/util/PayDemoActivity.java

@@ -106,6 +106,7 @@

         
         map.put("orderInfo", orderInfo);
         map.put("Type",2);
         
      } catch (Exception e) {
         e.printStackTrace();