Merge remote-tracking branch 'origin/div' into div

admin

2020-04-29 5aad3f49f4d00e4c15456a50a0c06e656ac5007d

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

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

    */

   public List<UserRank> getAllRank();

	
}