From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器
---
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