Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev

This commit is contained in:
Looly 2020-12-15 09:50:13 +08:00
commit 03e647e700

View File

@ -41,7 +41,7 @@ public class NumberUtil {
/**
* 默认除法运算精度
*/
private static final int DEFAUT_DIV_SCALE = 10;
private static final int DEFAULT_DIV_SCALE = 10;
/**
* 0-20对应的阶乘超过20的阶乘会超过Long.MAX_VALUE
@ -484,7 +484,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static double div(float v1, float v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -495,7 +495,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static double div(float v1, double v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -506,7 +506,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static double div(double v1, float v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -517,7 +517,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static double div(double v1, double v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -528,7 +528,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static double div(Double v1, Double v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -540,7 +540,7 @@ public class NumberUtil {
* @since 3.1.0
*/
public static BigDecimal div(Number v1, Number v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**
@ -551,7 +551,7 @@ public class NumberUtil {
* @return 两个参数的商
*/
public static BigDecimal div(String v1, String v2) {
return div(v1, v2, DEFAUT_DIV_SCALE);
return div(v1, v2, DEFAULT_DIV_SCALE);
}
/**