Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 94ae02e6f73b7011f0fcf6acff8636341d35351d

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java

@@ -302,6 +302,7 @@
        userDto.setCityCode(byId.getCityCode());
        userDto.setCity(byId.getCity());
        userDto.setName(byId.getName());
        userDto.setDetail(byId.getAddressDetail());
        return R.ok(userDto);

    }