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

admin

2020-03-20 c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/vip/UserVIPPreInfoMapper.java

@@ -2,8 +2,9 @@


import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;



public interface UserVIPPreInfoMapper extends BaseMapper<UserVIPPreInfo> {

@@ -15,7 +16,7 @@
    * @param procress

    * @return

    */

   UserVIPPreInfo selectByUidAndProcess(Long uid, int procress);

   UserVIPPreInfo selectByUidAndProcess(@Param("uid") Long uid, @Param("process") int process);



   /**

    * 根据用户ID检索

@@ -23,6 +24,6 @@
    * @param uid

    * @return

    */

   List<UserVIPPreInfo> listByUid(Long uid);

   List<UserVIPPreInfo> listByUid(@Param("uid") Long uid);



}