Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 8aa510ea43af4f4e36f226900ff653e78731688f

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserAddressClient.java

@@ -30,5 +30,5 @@
    * @return
    */
   @PostMapping("/user-address/getUserAddressById")
   R<UserAddress> getUserAddressById(@RequestParam("id") Integer id);
   R<UserAddress> getUserAddressById(@RequestParam("id") Long id);
}