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

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

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

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

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





   /**

    * 更新赠送记录

    * @param uid

    * 赠送退回

    * @param id

    * @param couponType

    */

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

   public void sendBackGive(Long id);



}