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

admin

2019-12-14 63d7d733938c8ea2fbb046625f1f70d6c48f8673

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

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

    * @return

    */

   public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid);

   public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid);





   /**