Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-21 c636e6909b8ed1dc1dba18bceca2554d5adde7f9

 ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java

@@ -1,6 +1,7 @@
package com.ruoyi.common.utils;

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,7 +29,7 @@
    }

    public static String toJsonString(Object object) {
        if (StringUtils.isNull(object)) {
        if (ObjectUtil.isNull(object)) {
            return null;
        }
        try {