Merge remote-tracking branch 'origin/master'

yujian

2019-02-15 a9ef4e874495d6e4fbc95146bd93a6f6544b1cc0

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -625,7 +625,7 @@
         // 通知

         if (notificationMap.get(type) == null) {

            HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());

            tempHongBao.setUserInfo(hongBao.getUserInfo());

            tempHongBao.setUserInfo(hongBaoOrder.getHongBaoV2().getUserInfo());

            tempHongBao.setMoney(hongBao.getMoney());

            CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());

            tempCommonOrder.setPayment(commonOrder.getPayment());