Merge remote-tracking branch 'origin/master'

admin

2019-05-23 df46ce4fadd17170e33cc9e350ea6645f1f4c849

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