Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-11-30 ce438f182a0d49de7f7f927dfd24e7e52a6527ee

 ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java

@@ -66,7 +66,7 @@

        if (null == destCharset)
        {
            srcCharset = StandardCharsets.UTF_8;
            destCharset = StandardCharsets.UTF_8;
        }

        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))