Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-10 fcabbb78c0158b4417f89475935f0f36f58f0d87

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