Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 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();
    }
}