冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

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

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

    */

   public List<UserRank> getAllRank();



   /**

    * 根据等级名称查询

    * @param rankName

    * @return

    */

   public UserRank getbyRankName(String rankName);

	
}