Merge remote-tracking branch 'origin/div' into div

yujian

2019-11-20 0f9a0a76b170bceac867dd5cd009e518ac6646e4

 fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackWinNewUserService.java

@@ -17,7 +17,7 @@
    * @param uid

    * @return

    */

   public boolean verifyHasReward(Long uid);

   public boolean verifyHasReward(Long uid, String device);