Merge remote-tracking branch 'origin/master'

yujian

2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3

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

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

    */

   public List<UserRank> getAllRank();

	
}