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

admin

2019-08-02 10e423b5a82eca7ad670435ba079f1fe74eac4d9

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

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

    */

   public List<UserRank> getAllRank();

	
}