diff --git a/doc/若依环境使用手册.docx b/doc/若依环境使用手册.docx
index c0edbcc48..fa5b62d7d 100644
Binary files a/doc/若依环境使用手册.docx and b/doc/若依环境使用手册.docx differ
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
index ddb8f3748..4c762ad84 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
@@ -16,7 +16,7 @@
-
+
修改头像
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
index 2022489ff..51174f1ea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -301,7 +301,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
}
sb.append(Character.toLowerCase(c));
}
-
return sb.toString();
}
@@ -364,7 +363,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
}
/**
- * 驼峰式命名法 例如:user_name->userName
+ * 驼峰式命名法
+ * 例如:user_name->userName
*/
public static String toCamelCase(String s)
{
@@ -372,6 +372,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
{
return null;
}
+ if (s.indexOf(SEPARATOR) == -1)
+ {
+ return s;
+ }
s = s.toLowerCase();
StringBuilder sb = new StringBuilder(s.length());
boolean upperCase = false;
@@ -401,4 +405,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
{
return (T) obj;
}
-}
\ No newline at end of file
+}