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

yujian

2020-04-23 c3f556e2413fbb5817f3907a73c4d4d2a2521cdb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -438,7 +438,7 @@
         if (vipInfo != null && vipInfo.getState() == UserVIPInfo.STATE_SUCCESS)

            time = vipInfo.getSuccessTime();



      } else if (level == UserLevelEnum.highVIP || level == UserLevelEnum.normalVIP) {

      } else if (level == UserLevelEnum.highVIP) {

         UserVIPPreInfo info = userVIPPreInfoService.selectByUidAndProcess(uid, level.getLevel());

         if (info != null)

            time = info.getCreateTime();