Merge remote-tracking branch 'origin/pim-jlmy' into pim_ywx

yaowanxin

6 天以前 df35c666ff8342343c82735ee25c5f04ae0d054c

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