Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

 fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java

@@ -21,7 +21,7 @@
   }



   public static BigDecimal div(BigDecimal d1, BigDecimal d2) {// 进行除法运算

      return d1.divide(d2).setScale(2, BigDecimal.ROUND_DOWN);

      return d1.divide(d2,2, BigDecimal.ROUND_DOWN);

   }



   public static BigDecimal getWithNoZera(BigDecimal num) {// 进行除法运算