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

yujian

2020-04-26 8f84f110e635237eace24f0077e9ab8f6b53d480

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java

@@ -347,6 +347,7 @@
      info.setId(userInfo.getId());

      info.setState(UserVIPInfo.STATE_INVALID);

      info.setUpdateTime(new Date());

      info.setBeiZhu(reason);

      userVIPInfoMapper.updateByPrimaryKeySelective(info);

      // 消息

      userAccountMsgNotificationService.vipUpgradeFail(uid, reason);