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

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

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

@@ -237,4 +237,10 @@
      return process;

   }



   @Override

   public UserVIPPreInfo selectByUidAndProcess(Long uid, int process) {

      UserVIPPreInfo info = userVIPPreInfoMapper.selectByUidAndProcess(uid, process);

      return info;

   }



}