Merge remote-tracking branch 'origin/master'

yujian

2019-03-06 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java

@@ -200,4 +200,9 @@
      }

   }



	
   @Override

   public List<ShamUser> listRandUser(int count) {

      return shamUserMapper.listRand(count);

   }

}