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

LiuHao

2024-03-08 598ece677dc38ccc4b8e63738e198b669ec05558

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