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

admin

2019-11-12 6c930b8374bf5b991bc423f02ed22420e78b85ff

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

@@ -327,9 +327,9 @@
   public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);



   /**

    * 激活免单券---订单已到账      TODO 待调用

    * 激活免单券---订单已到账   触发激活免单券

    * @param uid

    */

   public void activateFreeCoupon(Long uid);

   public void triggerFreeCouponActivate(Long uid);



}