Merge remote-tracking branch 'origin/master'

xjj

2024-02-27 dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java

@@ -276,7 +276,7 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getId());
            return String.valueOf(user.getNickname());
        }
        return null;
    }
@@ -292,7 +292,7 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getId());
            return String.valueOf(user.getNickname());
        }
        return null;
    }