Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java

@@ -34,7 +34,7 @@
   public long countQuery(String key, Integer state) throws PushCouponException;

   



   public void save(PushCoupon record) throws PushCouponException;

   public void save(PushCoupon record) throws PushCouponException, Exception;



   /**

    * 执行推送