Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

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

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

   }



   @Override

   public UserVIPPreInfo selectByUidAndProcess(Long uid, int process) {

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

      return info;

   }



}