Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

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

@@ -16,11 +16,11 @@
    public PromotionClient create(Throwable cause) {
        return new PromotionClient(){
            @Override
            public R<List<PromotionVideo>> getPromotionVideoList() {
            public R<List<PromotionVideo>> getPromotionVideoList(String source) {
                return R.fail("通过视频集合查询用户失败:" + cause.getMessage());
            }
            @Override
            public R<PromotionVideo> getPromotionVideoOne(Long promotionVideoId) {
            public R<PromotionVideo> getPromotionVideoOne(Long promotionVideoId, String source) {
                return R.fail("获取视频信息失败:" + cause.getMessage());
            }