Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 0485fe81732a49c91a0c1e8628ad90ca72458e55

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