diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java index a2f241d4c..c08316dc2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java @@ -1,12 +1,10 @@ package cn.iocoder.yudao.framework.common.util.object; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import java.lang.reflect.Field; import java.util.Arrays; -import java.util.Objects; import java.util.function.Consumer; /** @@ -47,6 +45,7 @@ public class ObjectUtils { return obj1.compareTo(obj2) > 0 ? obj1 : obj2; } + @SafeVarargs public static T defaultIfNull(T... array) { for (T item : array) { if (item != null) { @@ -56,6 +55,7 @@ public class ObjectUtils { return null; } + @SafeVarargs public static boolean equalsAny(T obj, T... array) { return Arrays.asList(array).contains(obj); } diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index d0364cfc4..647daf2c1 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-pro-vue3", - "version": "1.6.4.1863", + "version": "1.6.5.1863", "description": "基于vue3、vite3、element-plus、typesScript", "author": "xingyu", "private": false,