Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -176,5 +176,14 @@
    * @throws Exception

    */

   public void updateStateByArrivalAccount(String orderNo) throws Exception;



   /**

    * 领取未登录时已抽奖的礼品

    * @param uid

    * @param platform

    * @param device

    * @throws Exception

    */

   public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;

   

}