Merge remote-tracking branch 'origin/dev' into dev

AprilWind

2024-05-27 1bd40a0cff850e1c6dd41c6c606d48d31b9b76f6

 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java

@@ -17,6 +17,7 @@

    private final UserService userService;

    @Override
    public String translation(Object key, String other) {
        if (key instanceof Long id) {
            return userService.selectUserNameById(id);