Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-03 54c250656c2e471ad48ecaa8ccce16ec9d7eb8bd

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

@@ -10,7 +10,7 @@


   public int insert(PushCouponRecord record);



   public int insertSelective(PushCouponRecord record);

   public int insertSelective(PushCouponRecord record) throws Exception;



   public PushCouponRecord selectByPrimaryKey(Long id);