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

admin

2019-10-17 143160118ab3937ae9e340f61aafa764756856c8

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

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

    */

   public List<UserRank> getAllRank();

	
}