Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

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

   }

}