冲突信息

yujian

2019-12-16 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserRankMapper.java

@@ -1,14 +1,12 @@
package com.yeshi.fanli.dao.mybatis.user;


import java.util.List;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.user.UserRank;

public interface UserRankMapper extends BaseMapper<UserRank> {
	
   List<UserRank> getAllRank();
	
	
package com.yeshi.fanli.dao.mybatis.user;





import java.util.List;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.entity.bus.user.UserRank;



public interface UserRankMapper extends BaseMapper<UserRank> {

	
   List<UserRank> getAllRank();

}