From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

---
 src/main/java/com/moral/common/util/StringUtils.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/common/util/StringUtils.java b/src/main/java/com/moral/common/util/StringUtils.java
index b8b19d3..7205248 100644
--- a/src/main/java/com/moral/common/util/StringUtils.java
+++ b/src/main/java/com/moral/common/util/StringUtils.java
@@ -156,8 +156,4 @@
 		return true;
 	}
 
-	public static String scientificCountingConversion(String str){
-        BigDecimal db = new BigDecimal(str);
-        return db.toPlainString();
-    }
 }

--
Gitblit v1.8.0