Merge remote-tracking branch 'origin/master'

yujian

2019-05-24 c314495f8971d7ff6926e8c9d49f9e6817c4f20a

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

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

    */

   public List<UserRank> getAllRank();

	
}