Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066

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

@@ -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);

}