Merge remote-tracking branch 'origin/master'

admin

2019-05-23 afe02c8bff0abd0a4267325b576d00e4ed1ee668

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

@@ -9,6 +9,4 @@
public interface UserRankMapper extends BaseMapper<UserRank> {
   
   List<UserRank> getAllRank();
	
	
}