Merge remote-tracking branch 'origin/master'

Administrator

2018-11-13 06a7debe678e7ae30f39c61a7f71a926d52d1ae7

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

@@ -31,4 +31,7 @@
   
   List<ShamUser> listByDistinctPicUrl(@Param("start")long start, @Param("count")int count);
   
   // 随机取出数据
   List<ShamUser> listRand(@Param("count") int count);
	
}