Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 fb15a7eafc205b5b3c12ed9d82df6ff6872899d6

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserAddressClientFallbackFactory.java

@@ -20,7 +20,7 @@
         }
         
         @Override
         public R<UserAddress> getUserAddressById(Integer id) {
         public R<UserAddress> getUserAddressById(Long id) {
            return R.fail("根据id获取用户地址信息失败：" + cause.getMessage());
         }
      };