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

admin

2020-06-30 ade84017d710125aeaa256bfea674640b16747db

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

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

    */

   public List<UserRank> getAllRank();

	
}