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

yujian

2019-07-23 a39422f2a8ce45dd6cf65701ed5f9e65391c46c1

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

@@ -90,7 +90,7 @@
    * @throws UserSystemCouponException

    * @throws Exception

    */

   public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception;

   public void useOrderCoupon(Long uid, Long id, String orderNo, Integer goodsType) throws UserSystemCouponException, Exception;



   /**

    * 根据订单号获取奖励券使用进度