冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/ActivityUserMapper.java

@@ -18,4 +18,11 @@
    * @return
    */
   List<ActivityUser> listRand(@Param("count") int count);
	
   /**
    * 根据名称检索
    * @param name
    * @return
    */
   ActivityUser selectByName(String name);
}