Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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