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

yujian

2019-07-29 79b7711d49cee381ae0676f13a980851926a536c

 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);