Merge remote-tracking branch 'origin/master'

yujian

2019-05-14 e57271b299b6568fd00e8046b79befbb1f224d2c

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserRankService.java

@@ -11,5 +11,4 @@
    * @return

    */

   public List<UserRank> getAllRank();

	
}