From e02d6b65fae6f05e37f42c66242f05391c4a6d1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 19 一月 2026 16:39:21 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

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