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

k94314517

2023-10-28 11ff07252c6e6ed90e810cd9e5d033e7c7438a45

 server/web/src/main/java/com/doumee/api/web/PaymentCallback.java

@@ -56,8 +56,7 @@
            } else {
                // 支付失败
                switch (result.getAttach()) {
                    //家长支付订单
                    case "createOrder": {
                    case "createGoodsOrder": {

                        break;
                    }