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

admin

2020-05-21 49ed4f4521ce433a14810a0119bf3f2f7f6e606a

 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) {