Merge branch 'master' into div1

yujian

2019-01-10 391f2e33973b93b0aee53ca93affb1c92eb9a9d7

 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java

@@ -92,7 +92,7 @@
      hongBao.setId(hongBaoDTO.getId());

      hongBao.setOrderId(hongBaoDTO.getOrderId());



      if (hongBaoDTO.getSettlement() != null)

      if (hongBaoDTO.getSettlement() != null&&hongBaoDTO.getSettlement().compareTo(new BigDecimal(0))>0)

         hongBao.setPayMoney(hongBaoDTO.getSettlement());

      else

         hongBao.setPayMoney(hongBaoDTO.getPayMoney());