Merge branch 'dev1'

Administrator

2018-11-22 98d98236aa182386835d65794f772f6425cb14b5

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