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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java

@@ -103,7 +103,7 @@
     * @return 奖品列表
     */
    @GetMapping(value = "/prize/prizeList")
    R<List<Prize>> prizeList();
    R<List<Prize>> prizeList(@RequestParam("serveId") Integer serveId);

    /**
     * 奖品详情 -- 远程调用
@@ -131,4 +131,7 @@
    @GetMapping(value = "/franchisee/cityDetail")
    R<List<String>> cityDetail(@RequestParam("id") Integer id);

    @GetMapping(value = "/franchisee/getWorkPic")
    R<String> getWorkPic(@RequestParam("id") Integer id);

}