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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/service/manger/user/UserLevelManager.java

@@ -77,6 +77,8 @@
      info.setCreateTime(date);

      info.setProcess(level.getLevel());

      info.setUid(uid);

      //默认为订单型

      info.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);

      try {

         userVIPPreInfoService.addUserVIPPreInfo(info);

      } catch (UserVIPPreInfoException e) {