冲突文件

yujian

2019-06-24 bd331a582851cffcce54316e677e23760de4f384

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

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

    */

   public List<UserRank> getAllRank();

	
}