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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java

@@ -63,7 +63,7 @@
            }

            @Override
            public R<List<Prize>> prizeList() {
            public R<List<Prize>> prizeList(Integer serveId) {
                return R.fail("获取奖品列表失败" + cause.getMessage());
            }

@@ -82,6 +82,11 @@
                return R.fail(cause.getMessage());
            }

            @Override
            public R<String> getWorkPic(Integer id) {
                return R.fail(cause.getMessage());
            }

        };
    }
}