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

admin

2020-04-13 160c9b86a3dd9cf9823759ba2fa7acdfea40b6d9

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java

@@ -33,25 +33,6 @@
   public void changeBindingSuccess(Long uid, int type);



   /**

    * 账号合并成功

    * 
    * @param uid

    * @param lessUid

    */

   public void connectSuccess(Long uid, Long lessUid);



   /**

    * 用户等级变化

    * 
    * @param uid

    * @param orderType

    *            -订单类型（邀请订单/返利订单/分享订单）

    * @param orderCount

    * @param rankName

    */

   public void userRank(Long uid, String orderType, int orderCount, String rankName);



   /**

    * 淘宝授权失败

    * 

    * @param uid