From bafb1372a79174173b1da1b34ca32da7f80075a3 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 24 十一月 2021 08:39:07 +0800
Subject: [PATCH] !375 删除代码生成中冗余的导出方法 Merge pull request !375 from fuzui/delete_redundancy_gen_export_function
---
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
index 8108c0c..515cf0b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -785,19 +785,28 @@
* @param charset 字符集
* @return 字符串
*/
- public static String str(Object obj, Charset charset) {
- if (null == obj) {
+ public static String str(Object obj, Charset charset)
+ {
+ if (null == obj)
+ {
return null;
}
- if (obj instanceof String) {
+ if (obj instanceof String)
+ {
return (String) obj;
- } else if (obj instanceof byte[]) {
+ }
+ else if (obj instanceof byte[])
+ {
return str((byte[]) obj, charset);
- } else if (obj instanceof Byte[]) {
+ }
+ else if (obj instanceof Byte[])
+ {
byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
return str(bytes, charset);
- } else if (obj instanceof ByteBuffer) {
+ }
+ else if (obj instanceof ByteBuffer)
+ {
return str((ByteBuffer) obj, charset);
}
return obj.toString();
--
Gitblit v1.9.2