Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-25 4c1a7c9a3ca949ce878d9f5683fdafce4acbe635

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