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

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

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