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

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

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

@@ -164,7 +164,6 @@
      } catch (PushException e) {

         e.printStackTrace();

      }



   }



   @Override