Merge remote-tracking branch 'origin/master'

yujian

2019-05-24 c314495f8971d7ff6926e8c9d49f9e6817c4f20a

 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();
	
	
}