Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

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