Merge remote-tracking branch 'origin/master'

admin

2019-07-18 2a671d23fa0e5c979a8b6459b4914481cd10c353

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

@@ -52,4 +52,10 @@
   // 随机取出数据
   List<ShamUser> listRand(@Param("count") int count);
   
   /**
    * 检出所有
    * @return
    */
   List<ShamUser>  listAll();
	
}