Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 c8daa9e8958f5dd4d2e2de5f6560f7f1e3065786

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