Merge branch 'div_develop' into master_develop

yujian

2019-05-08 01275a0a4ae791282cfb84996b351c51827bd841

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

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

    */

   public List<UserRank> getAllRank();

	
}