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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java

@@ -85,4 +85,14 @@
   public void orderFoundFail(Long uid, String orderId);





   /**

    * 商品跑路订单失效消息

    * @param uid

    * @param orderId

    * @param orderSource

    * @param type

    */

   public void orderInvalidToBusinessRunning(Long uid, String orderId, int orderSource, int type);





}