From df35c666ff8342343c82735ee25c5f04ae0d054c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 02 九月 2025 15:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim_ywx
---
src/main/java/com/ruoyi/common/core/text/CharsetKit.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 8297661..4fa575c 100644
--- a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/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))
--
Gitblit v1.9.3