Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

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

@@ -237,4 +237,12 @@
    */

   public String giveCoupon(Long uid, Long id) throws UserSystemCouponException;



   /**

    * 更新赠送记录

    * @param uid

    * @param id

    * @param couponType

    */

   public void updateGiveRecord(Long uid, Long id, String couponType);



}