Merge remote-tracking branch 'origin/master'

admin

2019-03-22 a525f3faae1d749ccceefeb10612ab59cf4d9c1d

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