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

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

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