Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-18 4b486f955cd3d36fa09e372c484b7a66711d7ec7

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java

@@ -129,6 +129,7 @@
                    System.err.println("----收到购物回调");
                    break;
                case "HY":
                    System.err.println("----收到会员回调");
                    break;
            }