Merge remote-tracking branch 'origin/dev' into dev

ems-common/src/main/java/com/xzzn/common/utils/StringUtils.java

@@ -723,32 +723,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
 
     public static BigDecimal getBigDecimal(Object s){
-
+        BigDecimal result;
         try {
-            return new BigDecimal(s.toString());
+            result = new BigDecimal(s.toString());
         } catch (NumberFormatException e) {
             return BigDecimal.ZERO;
         }
-
+        return result;
     }
 
     public static Long getLong(Object s){
-
+        Long result;
         try {
-            return Long.parseLong(s.toString());
+            result =  Long.parseLong(s.toString());
         } catch (NumberFormatException e) {
             return Long.parseLong("0");
         }
-
+        return result;
     }
 
     public static String getString(Object s){
-
+        String result;
         try {
-            return String.valueOf(s);
+            result = String.valueOf(s);
         } catch (NumberFormatException e) {
             return "0";
         }
-
+        return result;
     }
 }