Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

 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;

	
}