fux bug

hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java

@@ -90,7 +90,7 @@ public class NamingCase {
 					} else if (Character.isLowerCase(preChar)) {
 						// 前一个为小写
 						sb.append(symbol);
-						if (null == nextChar || Character.isLowerCase(nextChar)) {
+						if (null == nextChar || Character.isLowerCase(nextChar) || CharUtil.isNumber(nextChar)) {
 							//普通首字母大写，如aBcc -> a_bcc
 							c = Character.toLowerCase(c);
 						}

hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java

@@ -0,0 +1,15 @@
+package cn.hutool.core.text;
+
+import cn.hutool.core.lang.Dict;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NamingCaseTest {
+	@Test
+	public void toUnderlineCaseTest(){
+		// https://github.com/dromara/hutool/issues/2070
+		Dict.create()
+				.set("customerNickV2", "customer_nick_v2")
+				.forEach((key, value) -> Assert.assertEquals(value, NamingCase.toUnderlineCase(key)));
+	}
+}

hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java

@@ -421,12 +421,6 @@ public class StrUtilTest {
 				.set("HelloWorld_test", "hello_world_test")
 				.set("H2", "H2")
 				.set("H#case", "H#case")
-				.forEach((key, value) -> Assert.assertEquals(value, StrUtil.toUnderlineCase(key)));
-	}
-
-	@Test
-	public void toUnderLineCaseTest2() {
-		Dict.create()
 				.set("PNLabel", "PN_label")
 				.forEach((key, value) -> Assert.assertEquals(value, StrUtil.toUnderlineCase(key)));
 	}