Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 3165a19feffb988e611405495b3ea85997f16f3a

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

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

    */

   public List<UserRank> getAllRank();

	
}