Merge branch 'master' into div

yujian

2019-07-02 572a8ec9a3adac7488395ae86bf875f3175f8d46

 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;

	
}