Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

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

@@ -205,11 +205,4 @@
    */

   public void randomRewardCoupon(int num, Long uid, String source) throws Exception;



   /**

    * 后端直接发送券

    * @param record

    * @param uid

    */

   public void randomRewardCouponForPush(Integer amount , Long uid) throws Exception;

	
}