Merge remote-tracking branch 'origin/div' into div

admin

2020-03-09 7c03a2c38c499e526f5c4258c35413160d784d04

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java

@@ -76,7 +76,7 @@
         e.printStackTrace();

      }



      PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);

      PushContentDTO dto = PushMsgFactory.createShareOrderStatisticed(orderType, orderId, money);

      try {

         pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

      } catch (NumberFormatException e) {