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

无关风月

2025-04-23 ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c

 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());
            }

        };
    }
}