Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-26 68a9c2da2d18c25fd7126b63ca3c1a98a63d7e77

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java

@@ -38,6 +38,6 @@

   @GetMapping("/site/getSiteList/byUserId")
   R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId);
   @GetMapping("/getPartnerR/{id}")
   @GetMapping("/partner/getPartnerR/{id}")
   R<Partner> getPartnerR(@PathVariable("id") Integer id);
}