Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/ForbiddenUserIdentifyCodeMapper.java

@@ -21,18 +21,4 @@
   List<ForbiddenUserIdentifyCode> listByTypeAndIdentifyCode(@Param("type") ForbiddenUserIdentifyCodeTypeEnum type,
         @Param("identifyCode") String identifyCode);
   
	
   /**
    *       查询封禁记录
    * @param start
    * @param count
    * @param key
    * @return
    */
   List<ForbiddenUserIdentifyCodeVO> listQuery(@Param("start") long start, @Param("count") int count,
         @Param("key") String key, @Param("type") Integer type);
	
	
   long countQuery(@Param("key") String key, @Param("type") Integer type);

}