冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 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);
}