Merge branch 'master' into div

yujian

2019-07-11 876b7917a2ba518ae77ca47f1cd57c58d5e8e84c

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