Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 beeda8df0023376dbb2021148a021731dc4aedb0

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java

@@ -61,7 +61,12 @@

            @Override
            public R sendGoodsGift(List<BirthdayGiftSendDto> giftSendDtoList) {
                return null;
                return R.fail("发送礼物失败:" + throwable.getMessage());
            }

            @Override
            public R autoCancelOrder(String orderId) {
                return R.fail("自动取消订单失败:" + throwable.getMessage());
            }
        };
    }