Merge remote-tracking branch 'origin/master'

ws

2023-09-20 6ad5ee724102a7cc115a4024c00e23b40b87072c

 src/main/java/com/fzzy/order/OrderManager.java

@@ -56,7 +56,7 @@
                return;
            }
            OrderData data = JSONObject.parseObject(req.getData().toString(), OrderData.class);

            data.setOrderid(req.getOrderid());
            //根据配置信息执行
            OrderApiService service;
            for (ApiConfs conf : apiConfList) {
@@ -66,7 +66,7 @@
                    continue;
                }

                service.execute(data, req.getType(), conf);
                service.execute(data, req.getType(), conf, req.getOrderid());
            }
        } catch (Exception e) {
            log.error("-----指令解析异常-----指令={}", req);