Merge branch 'master' into div

yujian

2019-07-02 572a8ec9a3adac7488395ae86bf875f3175f8d46

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java

@@ -58,7 +58,7 @@
   @Override

   public void alipayAccountValid(AlipayAccountValidNormalHistory history) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),

            "重庆椰视网络有限公司", new BigDecimal("0.1"), null);

            "重庆小影记科技有限公司", new BigDecimal("0.1"), null);

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {