Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

 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;



   /**

    * 执行推送