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

admin

2020-04-26 91d0826fffcc79d5869b15fffe4392399d23f0b1

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

@@ -49,10 +49,9 @@
    * @param days

    * @param targetNum1

    * @param targetNum2

    * @param type

    * @param teamPass true通过队员验证升级

    */

   public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,

         Integer type);

   public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2, boolean teamPass);



   /**

    * 超级会员升级成功